← Back to branch summary

~mmach/netext73/bcmwl-kernel-source

« back to all changes in this revision

Viewing changes to debian/patches/0022-add-support-for-Linux-4.8.patch.diff

  • Committer: mmach
  • Date: 2019-06-26 07:36:36 UTC
  • Revision ID: netbit73@gmail.com-20190626073636-rm4rlhgaov8qics9
dla 5.1

Show diffs side-by-side

added added

removed removed

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