Add patch for 4.3 on i686

3 files changed, 24 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8496e9ed103d..558fd3fdb3fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = broadcom-wl-dkms
 	pkgdesc = Broadcom 802.11 Linux STA wireless driver
 	pkgver = 6.30.223.271
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.broadcom.com/support/?gid=1
 	install = broadcom-wl-dkms.install
 	arch = i686
@@ -15,9 +15,11 @@ pkgbase = broadcom-wl-dkms
 	source = broadcom-wl-dkms.conf
 	source = dkms.conf.in
 	source = 001-null-pointer-fix.patch
+	source = 002-rdtscl.patch
 	sha256sums = b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283
 	sha256sums = c59c3ccf5238fe93cc671e6fa2f6614c0bfec073dc79bfda4d14e3a5be96eac8
 	sha256sums = 32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f
+	sha256sums = 1352b61510bea961d07af164eeb287bc8875dca26fa8ee7b219aa134531451d8
 	source_i686 = https://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz
 	sha256sums_i686 = 4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd
 	source_x86_64 = https://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz
diff --git a/002-rdtscl.patch b/002-rdtscl.patch
new file mode 100644
index 000000000000..0b9604ded570
--- /dev/null
+++ b/002-rdtscl.patch
@@ -0,0 +1,15 @@
+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)native_read_tsc();
++#else
+ 	rdtscl(cycles);
++#endif
+ #else
+ 	cycles = 0;
+ #endif 
diff --git a/PKGBUILD b/PKGBUILD
index a2173c6f2065..0c9e6a909706 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=broadcom-wl-dkms
 pkgver=6.30.223.271
-pkgrel=3
+pkgrel=4
 pkgdesc="Broadcom 802.11 Linux STA wireless driver"
 arch=('i686' 'x86_64')
 url="https://www.broadcom.com/support/?gid=1"
@@ -16,12 +16,14 @@ backup=('etc/modprobe.d/broadcom-wl-dkms.conf')
 install=broadcom-wl-dkms.install
 source=('broadcom-wl-dkms.conf'
         'dkms.conf.in'
-        '001-null-pointer-fix.patch')
+        '001-null-pointer-fix.patch'
+        '002-rdtscl.patch')
 source_i686=("https://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-${pkgver//./_}.tar.gz")
 source_x86_64=("https://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
 sha256sums=('b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283'
             'c59c3ccf5238fe93cc671e6fa2f6614c0bfec073dc79bfda4d14e3a5be96eac8'
-            '32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f')
+            '32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f'
+            '1352b61510bea961d07af164eeb287bc8875dca26fa8ee7b219aa134531451d8')
 sha256sums_i686=('4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd')
 sha256sums_x86_64=('5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be')
 
@@ -29,6 +31,7 @@ prepare() {
   sed -i -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" src/wl/sys/wl_linux.c
 
   patch -p1 < 001-null-pointer-fix.patch
+  patch -p1 < 002-rdtscl.patch
 
   sed -e "s/@PACKAGE_VERSION@/${pkgver}/" dkms.conf.in > dkms.conf
 }