Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/broadcom-sta/files/
Date: Thu, 26 Nov 2015 20:25:14
Message-Id: 1448569472.6850980d23bbe114d1349eedfa571332b77599f0.mattst88@gentoo
1 commit: 6850980d23bbe114d1349eedfa571332b77599f0
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 26 20:24:32 2015 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 26 20:24:32 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6850980d
7
8 net-wireless/broadcom-sta: Fix patch.
9
10 Bug: https://bugs.gentoo.org/show_bug.cgi?id=566882
11
12 .../files/broadcom-sta-6.30.223.271-linux-4.3.patch | 11 -----------
13 .../files/broadcom-sta-6.30.223.271-r2-linux-4.3.patch | 12 ++++++++++++
14 2 files changed, 12 insertions(+), 11 deletions(-)
15
16 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
17 deleted file mode 100644
18 index ae0dc56..0000000
19 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-linux-4.3.patch
20 +++ /dev/null
21 @@ -1,11 +0,0 @@
22 ---- a/src/shared/linux_osl.c 2015-09-19 00:47:15.000000000 +0200
23 -+++ b/src/shared/linux_osl.c 2015-11-09 17:02:22.000000000 +0100
24 -@@ -932,7 +932,7 @@
25 - uint cycles;
26 -
27 - #if defined(__i386__)
28 -- rdtscl(cycles);
29 -+ cycles = (u32)native_read_tsc();
30 - #else
31 - cycles = 0;
32 - #endif
33
34 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
35 new file mode 100644
36 index 0000000..7869dbf
37 --- /dev/null
38 +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3.patch
39 @@ -0,0 +1,12 @@
40 +diff -ruN a/src/shared/linux_osl.c b/src/shared/linux_osl.c
41 +--- a/src/shared/linux_osl.c 2015-11-26 12:16:23.343091098 -0800
42 ++++ b/src/shared/linux_osl.c 2015-11-26 12:17:08.657092739 -0800
43 +@@ -932,7 +932,7 @@
44 + uint cycles;
45 +
46 + #if defined(__i386__)
47 +- rdtscl(cycles);
48 ++ cycles = (u32)native_read_tsc();
49 + #else
50 + cycles = 0;
51 + #endif