Update to 6.30.223.271-3

5 files changed, 61 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e763cb38ed0d..6a419e1d2a94 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = broadcom-wl-ck
 	pkgdesc = Broadcom 802.11abgn hybrid Linux networking device driver for linux-ck.
 	pkgver = 6.30.223.271
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.broadcom.com/support/802.11/linux_sta.php
 	install = broadcom-wl-ck.install
 	arch = i686
@@ -28,11 +28,13 @@ pkgbase = broadcom-wl-ck
 	conflicts = broadcom-wl-ck-sandybridge
 	conflicts = broadcom-wl-ck-silvermont
 	source = modprobe.d
-	source = wl_linux.c.patch
 	source = license.patch
+	source = 001-null-pointer-fix.patch
+	source = 002-rdtscl.patch
 	sha256sums = b4aca51ac5ed20cb79057437be7baf3650563b7a9d5efc515f0b9b34fbb9dc32
-	sha256sums = 583335a6edb2ed1094977c401643d3e60471c6bc5c3ea81f45910a9cccb06032
 	sha256sums = 2f70be509aac743bec2cc3a19377be311a60a1c0e4a70ddd63ea89fae5df08ac
+	sha256sums = 32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f
+	sha256sums = 29929989d86fde903f98419ce52dbb1d862cd4a11b0b13b2432886eeb6daabea
 	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/001-null-pointer-fix.patch b/001-null-pointer-fix.patch
new file mode 100644
index 000000000000..adef19f30af1
--- /dev/null
+++ b/001-null-pointer-fix.patch
@@ -0,0 +1,27 @@
+Description: Fixing null pointer crash
+
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773713
+Bug-Ubuntu: https://launchpad.net/bugs/1415880
+Last-Update: 2015-08-18
+
+---
+ src/wl/sys/wl_linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 860b935..295156f 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -2157,8 +2157,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev)
+ 	wlif = WL_DEV_IF(dev);
+ 	wl = WL_INFO(dev);
+ 
++	skb->prev = NULL;
+ 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
+-		skb->prev = NULL;
+ 
+ 		TXQ_LOCK(wl);
+ 
+-- 
+1.9.1
+
diff --git a/002-rdtscl.patch b/002-rdtscl.patch
new file mode 100644
index 000000000000..cfa16075409b
--- /dev/null
+++ b/002-rdtscl.patch
@@ -0,0 +1,18 @@
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=fe47ae6e1a5005b2e82f7eab57b5c3820453293a
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=4ea1636b04dbd66536fa387bae2eea463efc705b
+
+diff -ru a/src/shared/linux_osl.c b/src/shared/linux_osl.c
+--- a/src/shared/linux_osl.c	2015-09-19 01:47:15.000000000 +0300
++++ b/src/shared/linux_osl.c	2015-11-21 15:20:30.585902518 +0200
+@@ -932,7 +932,11 @@
+ 	uint cycles;
+ 
+ #if defined(__i386__)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
++	cycles = (u32)rdtsc();
++#else
+ 	rdtscl(cycles);
++#endif
+ #else
+ 	cycles = 0;
+ #endif 
diff --git a/PKGBUILD b/PKGBUILD
index 8550365149ec..2c9b9ca5164c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=broadcom-wl-ck
 pkgver=6.30.223.271
-pkgrel=2
+pkgrel=3
 _pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver for linux-ck.'
 _extramodules="extramodules-4.3-ck"
 _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
@@ -19,13 +19,15 @@ conflicts=('broadcom-wl-ck-atom' 'broadcom-wl-ck-barcelona' 'broadcom-wl-ck-bull
 #replaces=()
 #groups=('ck-generic')
 source=('modprobe.d'
-'wl_linux.c.patch'
-'license.patch')
+'license.patch'
+'001-null-pointer-fix.patch'
+'002-rdtscl.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=('b4aca51ac5ed20cb79057437be7baf3650563b7a9d5efc515f0b9b34fbb9dc32'
-            '583335a6edb2ed1094977c401643d3e60471c6bc5c3ea81f45910a9cccb06032'
-            '2f70be509aac743bec2cc3a19377be311a60a1c0e4a70ddd63ea89fae5df08ac')
+            '2f70be509aac743bec2cc3a19377be311a60a1c0e4a70ddd63ea89fae5df08ac'
+            '32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f'
+            '29929989d86fde903f98419ce52dbb1d862cd4a11b0b13b2432886eeb6daabea')
 sha256sums_i686=('4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd')
 sha256sums_x86_64=('5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be')
 
@@ -33,8 +35,11 @@ install=broadcom-wl-ck.install
 
 prepare() {
   patch -p1 -i license.patch
-  patch -p1 -i wl_linux.c.patch
+  patch -p1 -i 001-null-pointer-fix.patch
 	sed -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" -i src/wl/sys/wl_linux.c
+
+	# linux 4.3 on i686 needs this to build
+	[[ $CARCH = "i686" ]] && patch -p1 -i 002-rdtscl.patch || return 0
 }
 
 
diff --git a/wl_linux.c.patch b/wl_linux.c.patch
deleted file mode 100644
index cf7d4b44ead3..000000000000
--- a/wl_linux.c.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/wl/sys/wl_linux.c.orig b/src/wl/sys/wl_linux.c
-index eb00717..489c9f5 100644
---- a/src/wl/sys/wl_linux.c.orig
-+++ b/src/wl/sys/wl_linux.c
-@@ -2166,8 +2166,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev)
- 	wlif = WL_DEV_IF(dev);
- 	wl = WL_INFO(dev);
- 
-+	skb->prev = NULL;
- 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
--		skb->prev = NULL;
- 
- 		TXQ_LOCK(wl);
-