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