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

[Alexander Rødseth]

    Date: Sunday, July 16, 2017 @ 22:53:28
  Author: arodseth
Revision: 245455

upgpkg: broadcom-wl-dkms 6.30.223.271-14

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

--------------------+
 007-linux412.patch |   46 +++++++++++++++++++++++++---------------------
 PKGBUILD           |    4 ++--
 2 files changed, 27 insertions(+), 23 deletions(-)

Modified: 007-linux412.patch
===================================================================
--- 007-linux412.patch	2017-07-16 22:30:29 UTC (rev 245454)
+++ 007-linux412.patch	2017-07-16 22:53:28 UTC (rev 245455)
@@ -1,21 +1,20 @@
-diff -ru sys0/wl_cfg80211_hybrid.c sys/wl_cfg80211_hybrid.c
+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
-@@ -52,8 +52,13 @@
- u32 wl_dbg_level = WL_DBG_ERR;
+@@ -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)
-+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 @@
+@@ -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,
@@ -27,38 +26,43 @@
     struct vif_params *params)
  {
  	struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
-@@ -2361,12 +2370,26 @@
+@@ -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_roam_info roam_info = {};
++	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);
- 	memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
+@@ -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.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);
++			&roam_info,
 +#else
- 	cfg80211_roamed(ndev,
  #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
  			&wl->conf->channel,	 
-@@ -2374,6 +2397,7 @@
+ #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, 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);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-16 22:30:29 UTC (rev 245454)
+++ PKGBUILD	2017-07-16 22:53:28 UTC (rev 245455)
@@ -6,7 +6,7 @@
 
 pkgname=broadcom-wl-dkms
 pkgver=6.30.223.271
-pkgrel=13
+pkgrel=14
 pkgdesc='Broadcom 802.11 Linux STA wireless driver'
 arch=('x86_64' 'i686')
 url="https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure"
@@ -33,7 +33,7 @@
             '09d709df0c764118ca43117f5c096163d9669a28170da8476d4b8211bd225d2e'
             '2306a59f9e7413f35a0669346dcd05ef86fa37c23b566dceb0c6dbee67e4d299'
             '5bc12cb57712e6a944dff1c90de50135c2508085d8497ab99284ccccdb35c32b'
-            '207559303f411de84821fbf16a94ba1ccf1e57495628fda98b9501c47cb64614')
+            'a3d13e8abb96ad440dbfae29acae82d31d1ced2ea62052f1efb2c3c4add347ce')
 sha256sums_x86_64=('5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be')
 sha256sums_i686=('4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd')