summaryrefslogtreecommitdiffstats
path: root/network/broadcom-sta
diff options
context:
space:
mode:
author Andreas Voegele2019-05-30 23:03:58 +0200
committer Willy Sudiarto Raharjo2019-05-30 23:03:58 +0200
commit6f554bb369648bb9e0c0ac4a086f9c421f8d891a (patch)
treed92e9e103f4f580ca4b614a457b34d0c040ec6f5 /network/broadcom-sta
parent8057cc225da879787177f338e14092eb8b0876cc (diff)
downloadslackbuilds-6f554bb369648bb9e0c0ac4a086f9c421f8d891a.tar.gz
network/broadcom-sta: Add new patch.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network/broadcom-sta')
-rw-r--r--network/broadcom-sta/broadcom-sta.SlackBuild9
-rw-r--r--network/broadcom-sta/patches/009-fix_mac_profile_discrepancy.patch14
2 files changed, 21 insertions, 2 deletions
diff --git a/network/broadcom-sta/broadcom-sta.SlackBuild b/network/broadcom-sta/broadcom-sta.SlackBuild
index dc29347d46..e533023942 100644
--- a/network/broadcom-sta/broadcom-sta.SlackBuild
+++ b/network/broadcom-sta/broadcom-sta.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for broadcom-sta
-# Copyright 2015-2018 Andreas Voegele <andreas@andreasvoegele.com>
+# Copyright 2015-2019 Andreas Voegele <andreas@andreasvoegele.com>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
@@ -18,7 +18,7 @@
PRGNAM=broadcom-sta
VERSION=${VERSION:-6.30.223.271}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
KERNEL=${KERNEL:-$( uname -r )}
@@ -85,6 +85,11 @@ patch -p2 < $CWD/patches/18-linux411.patch
patch -p2 < $CWD/patches/19-linux412.patch
patch -p2 < $CWD/patches/20-linux414.patch
patch -p2 < $CWD/patches/21-linux415.patch
+patch -p1 < $CWD/patches/009-fix_mac_profile_discrepancy.patch
+
+# See https://lkml.org/lkml/2019/3/1/643
+sed -i 's/get_ds()/KERNEL_DS/g' src/wl/sys/wl_iw.c
+sed -i 's/get_ds()/KERNEL_DS/g' src/wl/sys/wl_cfg80211_hybrid.c
env -u ARCH make -C /lib/modules/$KERNEL/build M=$(pwd) clean
env -u ARCH make -C /lib/modules/$KERNEL/build M=$(pwd)
diff --git a/network/broadcom-sta/patches/009-fix_mac_profile_discrepancy.patch b/network/broadcom-sta/patches/009-fix_mac_profile_discrepancy.patch
new file mode 100644
index 0000000000..835bfb7bb6
--- /dev/null
+++ b/network/broadcom-sta/patches/009-fix_mac_profile_discrepancy.patch
@@ -0,0 +1,14 @@
+Don't disconnect from certain roamable networks broadcasting multiple
+SSIDs. See https://bugs.archlinux.org/task/61090 for more information.
+
+diff -ur a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+--- a/src/wl/sys/wl_cfg80211_hybrid.c 2015-09-19 00:47:15.000000000 +0200
++++ b/src/wl/sys/wl_cfg80211_hybrid.c 2019-05-30 11:41:12.168748142 +0200
+@@ -1446,7 +1446,6 @@
+
+ if (memcmp(mac, wl->profile->bssid, ETHER_ADDR_LEN)) {
+ WL_ERR(("Wrong Mac address, mac = %pM profile =%pM\n", mac, wl->profile->bssid));
+- return -ENOENT;
+ }
+
+ err = wl_dev_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate));