OSDN Git Service

Add more patches for wl driver
[android-x86/external-kernel-drivers.git] / wl / wl-kmod-007_kernel_4.8_add_cfg80211_scan_info_struct.patch
1 diff -Naur a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
2 --- a/src/wl/sys/wl_cfg80211_hybrid.c   2016-09-07 22:38:13.303835653 +0200
3 +++ b/src/wl/sys/wl_cfg80211_hybrid.c   2016-09-07 22:54:53.550730661 +0200
4 @@ -2439,8 +2439,17 @@
5         s32 err = 0;
6  
7         if (wl->scan_request) {
8 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
9 +               struct cfg80211_scan_info info = {
10 +                       .aborted = true,
11 +               };
12 +#endif
13                 WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
14 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
15 +               cfg80211_scan_done(wl->scan_request, &info);
16 +#else
17                 cfg80211_scan_done(wl->scan_request, true);     
18 +#endif
19                 wl->scan_request = NULL;
20         }
21  
22 @@ -2541,7 +2550,14 @@
23  
24  scan_done_out:
25         if (wl->scan_request) {
26 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
27 +               struct cfg80211_scan_info info = {
28 +                       .aborted = false,
29 +               };
30 +               cfg80211_scan_done(wl->scan_request, &info);
31 +#else
32                 cfg80211_scan_done(wl->scan_request, false);
33 +#endif
34                 wl->scan_request = NULL;
35         }
36         rtnl_unlock();
37 @@ -2970,7 +2986,14 @@
38         s32 err = 0;
39  
40         if (wl->scan_request) {
41 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
42 +               struct cfg80211_scan_info info = {
43 +                       .aborted = true,
44 +               };
45 +               cfg80211_scan_done(wl->scan_request, &info);
46 +#else
47                 cfg80211_scan_done(wl->scan_request, true);     
48 +#endif
49                 wl->scan_request = NULL;
50         }
51