004-linux48.patch 1.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465
  1. From d3f93542326a06d920c6eb89b703384290d37b8b Mon Sep 17 00:00:00 2001
  2. From: Alberto Milone <alberto.milone@canonical.com>
  3. Date: Fri, 2 Sep 2016 17:35:34 +0200
  4. Subject: [PATCH 1/1] Add support for Linux 4.8
  5. Orginal author: Krzysztof Kolasa
  6. ---
  7. src/wl/sys/wl_cfg80211_hybrid.c | 22 ++++++++++++++++++++++
  8. 1 file changed, 22 insertions(+)
  9. diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
  10. index 2fc71fe..ec5e472 100644
  11. --- a/src/wl/sys/wl_cfg80211_hybrid.c
  12. +++ b/src/wl/sys/wl_cfg80211_hybrid.c
  13. @@ -2388,8 +2388,16 @@ wl_bss_connect_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
  14. s32 err = 0;
  15. if (wl->scan_request) {
  16. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
  17. + struct cfg80211_scan_info info = {
  18. + .aborted = true,
  19. + };
  20. + WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
  21. + cfg80211_scan_done(wl->scan_request, &info);
  22. +#else
  23. WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
  24. cfg80211_scan_done(wl->scan_request, true);
  25. +#endif
  26. wl->scan_request = NULL;
  27. }
  28. @@ -2490,7 +2498,14 @@ wl_notify_scan_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
  29. scan_done_out:
  30. if (wl->scan_request) {
  31. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
  32. + struct cfg80211_scan_info info = {
  33. + .aborted = false,
  34. + };
  35. + cfg80211_scan_done(wl->scan_request, &info);
  36. +#else
  37. cfg80211_scan_done(wl->scan_request, false);
  38. +#endif
  39. wl->scan_request = NULL;
  40. }
  41. rtnl_unlock();
  42. @@ -2909,7 +2924,14 @@ s32 wl_cfg80211_down(struct net_device *ndev)
  43. s32 err = 0;
  44. if (wl->scan_request) {
  45. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
  46. + struct cfg80211_scan_info info = {
  47. + .aborted = true,
  48. + };
  49. + cfg80211_scan_done(wl->scan_request, &info);
  50. +#else
  51. cfg80211_scan_done(wl->scan_request, true);
  52. +#endif
  53. wl->scan_request = NULL;
  54. }
  55. --
  56. 2.7.4