Update to 6.30.223.271-48

4 files changed, 88 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e604189da6aa..e2138606157f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Fri Jul 21 22:23:00 UTC 2017
+# Sat Aug 12 14:48:33 UTC 2017
 pkgbase = broadcom-wl-ck
 	pkgdesc = Broadcom 802.11abgn hybrid Linux networking device driver for linux-ck.
 	pkgver = 6.30.223.271
@@ -9,16 +9,17 @@ pkgbase = broadcom-wl-ck
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = linux-ck-headers>=4.11
-	makedepends = linux-ck-headers<4.12
-	depends = linux-ck>=4.11
-	depends = linux-ck<4.12
+	makedepends = linux-ck-headers>=4.12
+	makedepends = linux-ck-headers<4.13
+	depends = linux-ck>=4.12
+	depends = linux-ck<4.13
 	source = 001-null-pointer-fix.patch
 	source = 002-rdtscl.patch
 	source = 003-linux47.patch
 	source = 004-linux48.patch
 	source = 005-debian-fix-kernel-warnings.patch
 	source = 006-linux411.patch
+	source = 007-linux412.patch
 	source = modprobe.d
 	sha256sums = 32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f
 	sha256sums = 4ea03f102248beb8963ad00bd3e36e67519a90fa39244db065e74038c98360dd
@@ -26,6 +27,7 @@ pkgbase = broadcom-wl-ck
 	sha256sums = 09d709df0c764118ca43117f5c096163d9669a28170da8476d4b8211bd225d2e
 	sha256sums = 2306a59f9e7413f35a0669346dcd05ef86fa37c23b566dceb0c6dbee67e4d299
 	sha256sums = 5bc12cb57712e6a944dff1c90de50135c2508085d8497ab99284ccccdb35c32b
+	sha256sums = a3d13e8abb96ad440dbfae29acae82d31d1ced2ea62052f1efb2c3c4add347ce
 	sha256sums = b4aca51ac5ed20cb79057437be7baf3650563b7a9d5efc515f0b9b34fbb9dc32
 	source_i686 = https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz
 	sha256sums_i686 = 4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd
diff --git a/007-linux412.patch b/007-linux412.patch
new file mode 100644
index 000000000000..8abc73db4db1
--- /dev/null
+++ b/007-linux412.patch
@@ -0,0 +1,68 @@
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index da36405..d3741eb 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR;
+ #endif
+ 
+ static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++           enum nl80211_iftype type, struct vif_params *params);
++#else
+            enum nl80211_iftype type, u32 *flags, struct vif_params *params);
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+ static s32
+ wl_cfg80211_scan(struct wiphy *wiphy,
+@@ -466,7 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
+ 
+ static s32
+ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++                         enum nl80211_iftype type,
++#else
+                          enum nl80211_iftype type, u32 *flags,
++#endif
+    struct vif_params *params)
+ {
+ 	struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
+@@ -2361,6 +2369,20 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+                     const wl_event_msg_t *e, void *data)
+ {
+ 	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++	struct cfg80211_bss *bss;
++	struct wlc_ssid *ssid;
++	ssid = &wl->profile->ssid;
++	bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
++	ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
++	struct cfg80211_roam_info roam_info = {
++		.bss = bss,
++		.req_ie = conn_info->req_ie,
++		.req_ie_len = conn_info->req_ie_len,
++		.resp_ie = conn_info->resp_ie,
++		.resp_ie_len = conn_info->resp_ie_len,
++	};
++#endif
+ 	s32 err = 0;
+ 
+ 	wl_get_assoc_ies(wl);
+@@ -2368,12 +2390,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+ 	wl_update_bss_info(wl);
+ 	cfg80211_roamed(ndev,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++			&roam_info,
++#else
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
+ 			&wl->conf->channel,	 
+ #endif
+ 			(u8 *)&wl->bssid,
+ 			conn_info->req_ie, conn_info->req_ie_len,
+-			conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
++			conn_info->resp_ie, conn_info->resp_ie_len,
++#endif
++			GFP_KERNEL);
+ 	WL_DBG(("Report roaming result\n"));
+ 
+ 	set_bit(WL_STATUS_CONNECTED, &wl->status);
diff --git a/PKGBUILD b/PKGBUILD
index c8966820ca37..dacf4e19e6ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,14 +8,14 @@ pkgname=broadcom-wl-ck
 pkgver=6.30.223.271
 pkgrel=48
 _pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver for linux-ck.'
-_extramodules="extramodules-4.11-ck"
+_extramodules="extramodules-4.12-ck"
 _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 pkgdesc="${_pkgdesc}"
 arch=('i686' 'x86_64')
 url='https://www.broadcom.com/support/802.11'
 license=('custom')
-depends=('linux-ck>=4.11' 'linux-ck<4.12')
-makedepends=('linux-ck-headers>=4.11' 'linux-ck-headers<4.12')
+depends=('linux-ck>=4.12' 'linux-ck<4.13')
+makedepends=('linux-ck-headers>=4.12' 'linux-ck-headers<4.13')
 #replaces=()
 #groups=('ck-generic')
 source=(
@@ -25,6 +25,7 @@ source=(
         '004-linux48.patch'
         '005-debian-fix-kernel-warnings.patch'
         '006-linux411.patch'
+        '007-linux412.patch'
         'modprobe.d'
         )
 source_i686=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-${pkgver//./_}.tar.gz")
@@ -35,6 +36,7 @@ sha256sums=('32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f'
             '09d709df0c764118ca43117f5c096163d9669a28170da8476d4b8211bd225d2e'
             '2306a59f9e7413f35a0669346dcd05ef86fa37c23b566dceb0c6dbee67e4d299'
             '5bc12cb57712e6a944dff1c90de50135c2508085d8497ab99284ccccdb35c32b'
+            'a3d13e8abb96ad440dbfae29acae82d31d1ced2ea62052f1efb2c3c4add347ce'
             'b4aca51ac5ed20cb79057437be7baf3650563b7a9d5efc515f0b9b34fbb9dc32')
 sha256sums_i686=('4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd')
 sha256sums_x86_64=('5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be')
@@ -42,12 +44,13 @@ sha256sums_x86_64=('5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c7141
 install=readme.install
 
 prepare() {
-  patch -Np1 -i $srcdir/001-null-pointer-fix.patch
-  patch -Np1 -i $srcdir/002-rdtscl.patch
-  patch -Np1 -i $srcdir/003-linux47.patch
-  patch -Np1 -i $srcdir/004-linux48.patch
-  patch -Np1 -i $srcdir/005-debian-fix-kernel-warnings.patch
-  patch -Np1 -i $srcdir/006-linux411.patch
+  patch -Np1 -i "$srcdir/001-null-pointer-fix.patch"
+  patch -Np1 -i "$srcdir/002-rdtscl.patch"
+  patch -Np1 -i "$srcdir/003-linux47.patch"
+  patch -Np1 -i "$srcdir/004-linux48.patch"
+  patch -Np1 -i "$srcdir/005-debian-fix-kernel-warnings.patch"
+  patch -Np1 -i "$srcdir/006-linux411.patch"
+  patch -Np1 -i "$srcdir/007-linux412.patch"
 }
 
 
diff --git a/readme.install b/readme.install
index 25736d880f33..e38c2255c1d0 100644
--- a/readme.install
+++ b/readme.install
@@ -1,5 +1,5 @@
 post_upgrade() {
-	EXTRAMODULES='extramodules-4.11-ck'
+	EXTRAMODULES='extramodules-4.12-ck'
 	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }