summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authortwelveeighty2015-08-16 14:42:41 -0600
committertwelveeighty2015-08-16 14:42:41 -0600
commit2b7a13592e2d22f46d1f1a8bb957985506ca2a8d (patch)
tree34d4014ab582581b2d21e4d00ad7644117e1dd3c
parentb2541abc90ccd574b4ebe9bf80aff730a3c0f580 (diff)
downloadaur-2b7a13592e2d22f46d1f1a8bb957985506ca2a8d.tar.gz
Added patch for kernel 4.2
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD4
-rw-r--r--linux-recent.patch14
4 files changed, 19 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b472306b5676..9b8b46612842 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = broadcom-wl-dkms
pkgdesc = Broadcom 802.11 Linux STA wireless driver
pkgver = 6.30.223.248
- pkgrel = 6
+ pkgrel = 7
url = http://www.broadcom.com/support/802.11/linux_sta.php
install = broadcom-wl-dkms.install
arch = i686
@@ -19,7 +19,7 @@ pkgbase = broadcom-wl-dkms
sha256sums = b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283
sha256sums = 4e719f9c8468f7c802bb0e52939f2680abb1287d3817d91252958f0ae82f983b
sha256sums = 2f70be509aac743bec2cc3a19377be311a60a1c0e4a70ddd63ea89fae5df08ac
- sha256sums = ea2da813f890aa029d41b117f1b78d4379720c108101aef46aeb54df3c261f66
+ sha256sums = dfed527953ece43b407ae2016cc45d82463e2107d74ad9a3a780aea0ee64de03
sha256sums = b07ce80f2e079cce08c8ec006dda091f6f73f158c8a62df5bac2fbabb6989849
source_i686 = http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz
sha256sums_i686 = b196543a429c22b2b8d75d0c1d9e6e7ff212c3d3e1f42cc6fd9e4858f01da1ad
diff --git a/.gitignore b/.gitignore
index 67d748065652..609f9f1f2af8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*.xz
pkg/
src/
+patches/
diff --git a/PKGBUILD b/PKGBUILD
index b559a782746a..a4e873285a84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=broadcom-wl-dkms
_pkgname=broadcom-wl
pkgver=6.30.223.248
-pkgrel=6
+pkgrel=7
pkgdesc="Broadcom 802.11 Linux STA wireless driver"
url='http://www.broadcom.com/support/802.11/linux_sta.php'
arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ source=('broadcom-wl-dkms.conf'
sha256sums=('b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283'
'4e719f9c8468f7c802bb0e52939f2680abb1287d3817d91252958f0ae82f983b'
'2f70be509aac743bec2cc3a19377be311a60a1c0e4a70ddd63ea89fae5df08ac'
- 'ea2da813f890aa029d41b117f1b78d4379720c108101aef46aeb54df3c261f66'
+ 'dfed527953ece43b407ae2016cc45d82463e2107d74ad9a3a780aea0ee64de03'
'b07ce80f2e079cce08c8ec006dda091f6f73f158c8a62df5bac2fbabb6989849')
source_x86_64=("http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
sha256sums_x86_64=('3d994cc6c05198f4b6f07a213ac1e9e45a45159899e6c4a7feca5e6c395c3022')
diff --git a/linux-recent.patch b/linux-recent.patch
index 5461b1f823ed..d7a9550b3ef7 100644
--- a/linux-recent.patch
+++ b/linux-recent.patch
@@ -374,3 +374,17 @@
#endif
ASSERT(0);
return -1;
+--- a/src/wl/sys/wl_cfg80211_hybrid.c 2015-06-11 10:54:19.000000000 -0600
++++ b/src/wl/sys/wl_cfg80211_hybrid.c 2015-08-16 14:13:19.886705389 -0600
+@@ -2072,7 +2072,11 @@ 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) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
+ cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL);
++#else
++ cfg80211_disconnected(ndev, 0, NULL, 0, false, GFP_KERNEL);
++#endif
+ clear_bit(WL_STATUS_CONNECTED, &wl->status);
+ wl_link_down(wl);
+ wl_init_prof(wl->profile);