source: projects/specs/trunk/nonfree/self-build-broadcom-wl/19-linux412.patch @ 11261

a/amd64/src/wl/sys/wl_cfg80211_hybrid.c

@@ -53 +53 @@
 #endif
 
 static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
-           enum nl80211_iftype type, u32 *flags, struct vif_params *params);
+           enum nl80211_iftype type,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+           u32 *flags,
+#endif
+           struct vif_params *params);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
 static s32
 wl_cfg80211_scan(struct wiphy *wiphy,
@@ -466 +470 @@
 
 static s32
 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
-                         enum nl80211_iftype type, u32 *flags,
-   struct vif_params *params)
+                         enum nl80211_iftype type,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+                         u32 *flags,
+#endif
+                         struct vif_params *params)
 {
         struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
         struct wireless_dev *wdev;
@@ -2387 +2394 @@
                     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 = {
+                .bssid = wl->profile->bssid,
+                .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;
 
         err = wl_get_assoc_ies(wl);
@@ -2401 +2417 @@
                 return err;
 
         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);