summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Brewer <tomboy64@sina.cn>2016-02-06 06:24:13 +0100
committerMatthew Brewer <tomboy64@sina.cn>2016-02-09 18:55:32 +0100
commit96c5f980d1625514f710712f0bf92291536481ff (patch)
treefdaa12788af4ed01048126d48bd5d165c35a165c /net-wireless/broadcom-sta/files
parentnet-wireless/broadcom-sta: minor changes, no revision necessary (diff)
downloadgentoo-96c5f980d1625514f710712f0bf92291536481ff.tar.gz
gentoo-96c5f980d1625514f710712f0bf92291536481ff.tar.bz2
gentoo-96c5f980d1625514f710712f0bf92291536481ff.zip
net-wireless/broadcom-sta: fix for bug#573854
reincarnation of #565254 (tsc mess) => update the patch to use a non-deprecated function and to be applicable to pre- and post-4.3 kernels Package-Manager: portage-2.2.26 RepoMan-Options: --ignore-arches
Diffstat (limited to 'net-wireless/broadcom-sta/files')
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch
new file mode 100644
index 000000000000..588f77ad16f2
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch
@@ -0,0 +1,16 @@
+diff -ruN a/src/shared/linux_osl.c b/src/shared/linux_osl.c
+--- a/src/shared/linux_osl.c 2015-11-26 12:16:23.343091098 -0800
++++ b/src/shared/linux_osl.c 2015-11-26 12:17:08.657092739 -0800
+@@ -932,7 +932,11 @@
+ uint cycles;
+
+ #if defined(__i386__)
+- rdtscl(cycles);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
++ cycles = (u32)rdtsc();
++#else
++ rdtscl(cycles);
++#endif
+ #else
+ cycles = 0;
+ #endif