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/, net-wireless/broadcom-sta/files/
Date: Mon, 02 Nov 2015 17:31:50
Message-Id: 1446485519.156b8869e520a9ba53e0e02bafd9831c4a78b2c9.mattst88@gentoo
1 commit: 156b8869e520a9ba53e0e02bafd9831c4a78b2c9
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 2 17:30:44 2015 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 2 17:31:59 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=156b8869
7
8 net-wireless/broadcom-sta: Readd necessary patch hunk.
9
10 Necessary to prevent a hang.
11
12 Bug: https://bugs.gentoo.org/562620
13
14 ...30.223.271.ebuild => broadcom-sta-6.30.223.271-r1.ebuild} | 1 +
15 .../files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch | 12 ++++++++++++
16 2 files changed, 13 insertions(+)
17
18 diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild
19 similarity index 97%
20 rename from net-wireless/broadcom-sta/broadcom-sta-6.30.223.271.ebuild
21 rename to net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild
22 index bf18fda..0d61639 100644
23 --- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271.ebuild
24 +++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild
25 @@ -63,6 +63,7 @@ src_prepare() {
26 "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \
27 "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \
28 "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \
29 + "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" \
30 "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch"
31
32 epatch_user
33
34 diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch
35 new file mode 100644
36 index 0000000..9a0e713
37 --- /dev/null
38 +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch
39 @@ -0,0 +1,12 @@
40 +--- a/src/wl/sys/wl_linux.c 2014-06-26 12:42:08.000000000 +0200
41 ++++ b/src/wl/sys/wl_linux.c 2015-01-22 01:44:58.580453805 +0100
42 +@@ -2157,8 +2159,8 @@
43 + wlif = WL_DEV_IF(dev);
44 + wl = WL_INFO(dev);
45 +
46 ++ skb->prev = NULL;
47 + if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
48 +- skb->prev = NULL;
49 +
50 + TXQ_LOCK(wl);
51 +