| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475 |
- Ffix for 4.12
- ---
- src/wl/sys/wl_cfg80211_hybrid.c | 29 ++++++++++++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
- diff -Nurp broadcom-wl-6.30.223.271.orig/src/wl/sys/wl_cfg80211_hybrid.c broadcom-wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c
- --- broadcom-wl-6.30.223.271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2020-01-11 01:25:39.080492424 +0200
- +++ broadcom-wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c 2020-01-11 01:34:37.953072128 +0200
- @@ -54,7 +54,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,
- @@ -467,7 +471,11 @@ wl_dev_ioctl(struct net_device *dev, u32
-
- 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);
- @@ -2362,6 +2370,20 @@ wl_bss_roaming_done(struct wl_cfg80211_p
- 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);
- @@ -2369,12 +2391,17 @@ wl_bss_roaming_done(struct wl_cfg80211_p
- 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);
|
