[gentoo-commits] repo/gentoo:master commit in: net-wireless/broadcom-sta/files/

[gentoo-commits] repo/gentoo:master commit in: net-wireless/broadcom-sta/files/

[Matt Turner]

commit:     6850980d23bbe114d1349eedfa571332b77599f0
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 20:24:32 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 20:24:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6850980d

net-wireless/broadcom-sta: Fix patch.

Bug: https://bugs.gentoo.org/show_bug.cgi?id=566882

 .../files/broadcom-sta-6.30.223.271-linux-4.3.patch          | 11 -----------
 .../files/broadcom-sta-6.30.223.271-r2-linux-4.3.patch       | 12 ++++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-linux-4.3.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-linux-4.3.patch
deleted file mode 100644
index ae0dc56..0000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-linux-4.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/shared/linux_osl.c    2015-09-19 00:47:15.000000000 +0200
-+++ b/src/shared/linux_osl.c    2015-11-09 17:02:22.000000000 +0100
-@@ -932,7 +932,7 @@
-       	uint cycles;
- 
- #if defined(__i386__)
--       rdtscl(cycles);
-+       cycles = (u32)native_read_tsc();
- #else
-       	cycles = 0;
- #endif 

diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3.patch
new file mode 100644
index 0000000..7869dbf
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3.patch
@@ -0,0 +1,12 @@
+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,7 @@
+ 	uint cycles;
+ 
+ #if defined(__i386__)
+-	rdtscl(cycles);
++	cycles = (u32)native_read_tsc();
+ #else
+ 	cycles = 0;
+ #endif