summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2015-11-02 09:30:44 -0800
committerMatt Turner <mattst88@gentoo.org>2015-11-02 09:31:59 -0800
commit156b8869e520a9ba53e0e02bafd9831c4a78b2c9 (patch)
tree5a867a8880dafa0aedf2902ee12b7c01004dfba2 /net-wireless/broadcom-sta
parentnet-misc/openconnect: add myself as a maintainer (diff)
downloadgentoo-156b8869e520a9ba53e0e02bafd9831c4a78b2c9.tar.gz
gentoo-156b8869e520a9ba53e0e02bafd9831c4a78b2c9.tar.bz2
gentoo-156b8869e520a9ba53e0e02bafd9831c4a78b2c9.zip
net-wireless/broadcom-sta: Readd necessary patch hunk.
Necessary to prevent a hang. Bug: https://bugs.gentoo.org/562620
Diffstat (limited to 'net-wireless/broadcom-sta')
-rw-r--r--net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild (renamed from net-wireless/broadcom-sta/broadcom-sta-6.30.223.271.ebuild)1
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch12
2 files changed, 13 insertions, 0 deletions
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
index bf18fdad061..0d61639540d 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 00000000000..9a0e7136c53
--- /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);
+