[arch-commits] Commit in broadcom-wl-dkms/trunk (007-linux412.patch PKGBUILD)

[Alexander Rødseth]

    Date: Saturday, July 15, 2017 @ 23:12:23
  Author: arodseth
Revision: 245277

upgpkg: broadcom-wl-dkms 6.30.223.271-13

Added:
  broadcom-wl-dkms/trunk/007-linux412.patch
Modified:
  broadcom-wl-dkms/trunk/PKGBUILD

--------------------+
 007-linux412.patch |   64 +++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD           |    7 +++--
 2 files changed, 68 insertions(+), 3 deletions(-)

Added: 007-linux412.patch
===================================================================
--- 007-linux412.patch	                        (rev 0)
+++ 007-linux412.patch	2017-07-15 23:12:23 UTC (rev 245277)
@@ -0,0 +1,64 @@
+diff -ru sys0/wl_cfg80211_hybrid.c sys/wl_cfg80211_hybrid.c
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -52,8 +52,13 @@
+ u32 wl_dbg_level = WL_DBG_ERR;
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
++           enum nl80211_iftype type, struct vif_params *params);
++#else
+ static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
+            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 +471,11 @@
+ 
+ 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,12 +2370,26 @@
+                     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_roam_info roam_info = {};
++#endif
+ 	s32 err = 0;
+ 
+ 	wl_get_assoc_ies(wl);
+ 	memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
+ 	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+ 	wl_update_bss_info(wl);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++	roam_info.channel = &wl->conf->channel,
++	roam_info.bssid = (u8 *)&wl->bssid,
++	roam_info.req_ie = conn_info->req_ie,
++	roam_info.req_ie_len = conn_info->req_ie_len,
++	roam_info.resp_ie = conn_info->resp_ie,
++	roam_info.resp_ie_len = conn_info->resp_ie_len,
++
++	cfg80211_roamed(ndev, &roam_info, GFP_KERNEL);
++#else
+ 	cfg80211_roamed(ndev,
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
+ 			&wl->conf->channel,	 
+@@ -2374,6 +2397,7 @@
+ 			(u8 *)&wl->bssid,
+ 			conn_info->req_ie, conn_info->req_ie_len,
+ 			conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
++#endif
+ 	WL_DBG(("Report roaming result\n"));
+ 
+ 	set_bit(WL_STATUS_CONNECTED, &wl->status);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-15 22:18:34 UTC (rev 245276)
+++ PKGBUILD	2017-07-15 23:12:23 UTC (rev 245277)
@@ -6,7 +6,7 @@
 
 pkgname=broadcom-wl-dkms
 pkgver=6.30.223.271
-pkgrel=12
+pkgrel=13
 pkgdesc='Broadcom 802.11 Linux STA wireless driver'
 arch=('x86_64' 'i686')
 url="https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure"
@@ -21,7 +21,8 @@
         '003-linux47.patch'
         '004-linux48.patch'
         '005-debian-fix-kernel-warnings.patch'
-        '006-linux411.patch')
+        '006-linux411.patch'
+        '007-linux412.patch')
 source_i686=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-${pkgver//./_}.tar.gz")
 source_x86_64=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
 sha256sums=('b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283'
@@ -53,4 +54,4 @@
   sed -n -e '/Copyright/,/SOFTWARE\./{s/^ \* //;p}' src/wl/sys/wl_linux.c > "${ldir}/LICENSE.module"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et: