diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 28 | ||||
| -rw-r--r-- | linux42.patch | 12 | ||||
| -rw-r--r-- | wl_linux.c.patch | 14 |
4 files changed, 44 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..e9648f0f4308 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +pkg/ +src/ @@ -1,11 +1,12 @@ -# Maintainer: Johannes Löthberg <johannes@kyriasis.com> +# Maintainer: Raimar Bühmann ( raimar [at] buehmann [dot] de ) +# Contributor: Johannes Löthberg <johannes@kyriasis.com> # Contributor: Armin K. <krejzi at email dot com> # Contributor: Austin ( doorknob60 [at] gmail [dot] com ) # Contributor: Gaetan Bisson <bisson@archlinux.org> pkgname=broadcom-wl -pkgver=6.30.223.248 -pkgrel=6 +pkgver=6.30.223.271 +pkgrel=1 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver' url='http://www.broadcom.com/support/802.11/linux_sta.php' @@ -17,17 +18,18 @@ makedepends=('linux-headers') source=('modprobe.d' 'license.patch' - 'linux-recent.patch' - 'gcc.patch') + 'wl_linux.c.patch' +# 'linux-recent.patch' +# 'linux42.patch' +# 'gcc.patch' +) source_i686=("http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-${pkgver//./_}.tar.gz") source_x86_64=("http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz") - sha256sums=('b4aca51ac5ed20cb79057437be7baf3650563b7a9d5efc515f0b9b34fbb9dc32' '2f70be509aac743bec2cc3a19377be311a60a1c0e4a70ddd63ea89fae5df08ac' - '922a5b183643db256d03b147f051fbf2032be8104412a661296efe4f781f2e59' - 'b07ce80f2e079cce08c8ec006dda091f6f73f158c8a62df5bac2fbabb6989849') -sha256sums_i686=('b196543a429c22b2b8d75d0c1d9e6e7ff212c3d3e1f42cc6fd9e4858f01da1ad') -sha256sums_x86_64=('3d994cc6c05198f4b6f07a213ac1e9e45a45159899e6c4a7feca5e6c395c3022') + '583335a6edb2ed1094977c401643d3e60471c6bc5c3ea81f45910a9cccb06032') +sha256sums_i686=('4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd') +sha256sums_x86_64=('5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be') install=install @@ -35,9 +37,11 @@ _kernmajor="$(pacman -Q linux | sed -r 's/linux ([0-9]*.[0-9]*).*/\1/')" _kernver="$(</usr/lib/modules/extramodules-"$_kernmajor"-ARCH/version)" prepare() { - patch -p1 -i linux-recent.patch patch -p1 -i license.patch - patch -p1 -i gcc.patch +# patch -p1 -i linux-recent.patch +# patch -p1 -i linux42.patch +# patch -p1 -i gcc.patch + patch -p1 -i wl_linux.c.patch sed -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" \ -i src/wl/sys/wl_linux.c diff --git a/linux42.patch b/linux42.patch new file mode 100644 index 000000000000..a048ffcd17d0 --- /dev/null +++ b/linux42.patch @@ -0,0 +1,12 @@ +--- a/src/wl/sys/wl_cfg80211_hybrid.c 2014-06-26 12:42:08.000000000 +0200 ++++ b/src/wl/sys/wl_cfg80211_hybrid.c 2015-09-08 14:43:56.271288368 +0200 +@@ -2047,7 +2047,7 @@ wl_notify_connect_status(struct wl_cfg80 + } + else if ((event == WLC_E_LINK && ~(flags & WLC_EVENT_MSG_LINK)) || + event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) { +- cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL); ++ cfg80211_disconnected(ndev, 0, NULL, 0, false, GFP_KERNEL); + clear_bit(WL_STATUS_CONNECTED, &wl->status); + wl_link_down(wl); + wl_init_prof(wl->profile); + diff --git a/wl_linux.c.patch b/wl_linux.c.patch new file mode 100644 index 000000000000..cf7d4b44ead3 --- /dev/null +++ b/wl_linux.c.patch @@ -0,0 +1,14 @@ +diff --git a/src/wl/sys/wl_linux.c.orig b/src/wl/sys/wl_linux.c +index eb00717..489c9f5 100644 +--- a/src/wl/sys/wl_linux.c.orig ++++ b/src/wl/sys/wl_linux.c +@@ -2166,8 +2166,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev) + 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); + |