commit:     156b8869e520a9ba53e0e02bafd9831c4a78b2c9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  2 17:30:44 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Nov  2 17:31:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=156b8869

net-wireless/broadcom-sta: Readd necessary patch hunk.

Necessary to prevent a hang.

Bug: https://bugs.gentoo.org/562620

 ...30.223.271.ebuild => broadcom-sta-6.30.223.271-r1.ebuild} |  1 +
 .../files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch      | 12 ++++++++++++
 2 files changed, 13 insertions(+)

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
similarity index 97%
rename from net-wireless/broadcom-sta/broadcom-sta-6.30.223.271.ebuild
rename to net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild
index bf18fda..0d61639 100644
--- 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
@@ -63,6 +63,7 @@ src_prepare() {
                "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \
                "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \
                "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \
+               "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" \
                "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch"
 
        epatch_user

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
new file mode 100644
index 0000000..9a0e713
--- /dev/null
+++ 
b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch
@@ -0,0 +1,12 @@
+--- a/src/wl/sys/wl_linux.c    2014-06-26 12:42:08.000000000 +0200
++++ b/src/wl/sys/wl_linux.c    2015-01-22 01:44:58.580453805 +0100
+@@ -2157,8 +2159,8 @@
+       wlif = WL_DEV_IF(dev);
+       wl = WL_INFO(dev);
+ 
++      skb->prev = NULL;
+       if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
+-              skb->prev = NULL;
+ 
+               TXQ_LOCK(wl);
+ 

Reply via email to