Add support for Linux 4.8

4 files changed, 63 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ab7989d9f7e..edb56497a9e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Aug 11 11:57:50 UTC 2016
+# Thu Oct  6 18:08:23 UTC 2016
 pkgbase = broadcom-wl-dkms
 	pkgdesc = Broadcom 802.11 Linux STA wireless driver
 	pkgver = 6.30.223.271
-	pkgrel = 9
+	pkgrel = 10
 	url = https://www.broadcom.com/support/802.11
 	install = broadcom-wl-dkms.install
 	arch = i686
@@ -20,11 +20,13 @@ pkgbase = broadcom-wl-dkms
 	source = 001-null-pointer-fix.patch
 	source = 002-rdtscl.patch
 	source = 003-linux47.patch
+	source = 004-linux48.patch
 	sha256sums = b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283
 	sha256sums = 73438b29a1f422ed231b3857d491813c396a8be4fe34f006ce40679bba03d127
 	sha256sums = 32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f
 	sha256sums = 4ea03f102248beb8963ad00bd3e36e67519a90fa39244db065e74038c98360dd
 	sha256sums = 30ce1d5e8bf78aee487d0f3ac76756e1060777f70ed1a9cf95215c3a52cfbe2e
+	sha256sums = 833af3b209d6a101d9094db16480bda2ad9a85797059b0ae0b13235ad3818e9c
 	source_i686 = http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz
 	sha256sums_i686 = 4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd
 	source_x86_64 = http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz
diff --git a/004-linux48.patch b/004-linux48.patch
new file mode 100644
index 000000000000..0f3e81906226
--- /dev/null
+++ b/004-linux48.patch
@@ -0,0 +1,52 @@
+Reference: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839629
+
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2016-10-03 10:53:55.588036464 +0200
++++ b/src/wl/sys/wl_cfg80211_hybrid.c	2016-10-03 10:54:11.911695944 +0200
+@@ -2386,8 +2386,15 @@
+ 	s32 err = 0;
+ 
+ 	if (wl->scan_request) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++		struct cfg80211_scan_info info = {
++			.aborted = true
++		};
+ 		WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
+-		cfg80211_scan_done(wl->scan_request, true);     
++		cfg80211_scan_done(wl->scan_request, &info);
++#else
++		cfg80211_scan_done(wl->scan_request, true);
++#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 
+@@ -2488,7 +2495,14 @@
+ 
+ scan_done_out:
+ 	if (wl->scan_request) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++		struct cfg80211_scan_info info = {
++			.aborted = false
++		};
++		cfg80211_scan_done(wl->scan_request, &info);
++#else
+ 		cfg80211_scan_done(wl->scan_request, false);
++#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 	rtnl_unlock();
+@@ -2913,7 +2927,14 @@
+ 	s32 err = 0;
+ 
+ 	if (wl->scan_request) {
+-		cfg80211_scan_done(wl->scan_request, true);	
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++		struct cfg80211_scan_info info = {
++			.aborted = true
++		};
++		cfg80211_scan_done(wl->scan_request, &info);
++#else
++		cfg80211_scan_done(wl->scan_request, true);
++#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 726b8dbda6d9..6fa6aaf19222 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=broadcom-wl-dkms
 pkgver=6.30.223.271
-pkgrel=9
+pkgrel=10
 pkgdesc="Broadcom 802.11 Linux STA wireless driver"
 arch=('i686' 'x86_64')
 url="https://www.broadcom.com/support/802.11"
@@ -20,14 +20,16 @@ source=('broadcom-wl-dkms.conf'
         'dkms.conf.in'
         '001-null-pointer-fix.patch'
         '002-rdtscl.patch'
-        '003-linux47.patch')
+        '003-linux47.patch'
+        '004-linux48.patch')
 source_i686=("http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-${pkgver//./_}.tar.gz")
 source_x86_64=("http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
 sha256sums=('b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283'
-            '73438b29a1f422ed231b3857d491813c396a8be4fe34f006ce40679bba03d127'
+            'a453cfd7c8ad5b04afa6a55189b445356090b52fd480c2b5ec843bfeec72b9bf'
             '32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f'
             '4ea03f102248beb8963ad00bd3e36e67519a90fa39244db065e74038c98360dd'
-            '30ce1d5e8bf78aee487d0f3ac76756e1060777f70ed1a9cf95215c3a52cfbe2e')
+            '30ce1d5e8bf78aee487d0f3ac76756e1060777f70ed1a9cf95215c3a52cfbe2e'
+            '833af3b209d6a101d9094db16480bda2ad9a85797059b0ae0b13235ad3818e9c')
 sha256sums_i686=('4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd')
 sha256sums_x86_64=('5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be')
 
diff --git a/dkms.conf.in b/dkms.conf.in
index 6d5f0fb9e41f..6fa394fd4066 100644
--- a/dkms.conf.in
+++ b/dkms.conf.in
@@ -5,4 +5,5 @@ DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless"
 PATCH[0]="001-null-pointer-fix.patch"
 PATCH[1]="002-rdtscl.patch"
 PATCH[2]="003-linux47.patch"
+PATCH[3]="004-linux48.patch"
 AUTOINSTALL="yes"