projects / packages / wl.git / blame
| Commit | Line | Data |
|---|---|---|
| c90561b2 JR |
1 | diff -urNp -x '*.orig' wl-6.30.223.271.org/src/wl/sys/wl_cfg80211_hybrid.c wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c |
| 2 | --- wl-6.30.223.271.org/src/wl/sys/wl_cfg80211_hybrid.c 2021-02-25 20:01:38.124327695 +0100 | |
| 3 | +++ wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c 2021-02-25 20:01:38.250994664 +0100 | |
| 4 | @@ -60,7 +60,11 @@ u32 wl_dbg_level = WL_DBG_ERR; | |
| 60301872 JR |
5 | #endif |
| 6 | ||
| 7 | static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, | |
| 8 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) | |
| 9 | + enum nl80211_iftype type, struct vif_params *params); | |
| 10 | +#else | |
| 11 | enum nl80211_iftype type, u32 *flags, struct vif_params *params); | |
| 12 | +#endif | |
| 13 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) | |
| 14 | static s32 | |
| 15 | wl_cfg80211_scan(struct wiphy *wiphy, | |
| c90561b2 | 16 | @@ -473,7 +477,11 @@ wl_dev_ioctl(struct net_device *dev, u32 |
| 60301872 JR |
17 | |
| 18 | static s32 | |
| 19 | wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, | |
| 20 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) | |
| 21 | + enum nl80211_iftype type, | |
| 22 | +#else | |
| 23 | enum nl80211_iftype type, u32 *flags, | |
| 24 | +#endif | |
| 25 | struct vif_params *params) | |
| 26 | { | |
| 27 | struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); | |
| c90561b2 | 28 | @@ -2394,6 +2402,20 @@ wl_bss_roaming_done(struct wl_cfg80211_p |
| 60301872 JR |
29 | const wl_event_msg_t *e, void *data) |
| 30 | { | |
| 31 | struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); | |
| 32 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) | |
| 33 | + struct cfg80211_bss *bss; | |
| 34 | + struct wlc_ssid *ssid; | |
| 35 | + ssid = &wl->profile->ssid; | |
| 36 | + bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid, | |
| 37 | + ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); | |
| 38 | + struct cfg80211_roam_info roam_info = { | |
| 39 | + .bss = bss, | |
| 40 | + .req_ie = conn_info->req_ie, | |
| 41 | + .req_ie_len = conn_info->req_ie_len, | |
| 42 | + .resp_ie = conn_info->resp_ie, | |
| 43 | + .resp_ie_len = conn_info->resp_ie_len, | |
| 44 | + }; | |
| 45 | +#endif | |
| 46 | s32 err = 0; | |
| 47 | ||
| c90561b2 JR |
48 | err = wl_get_assoc_ies(wl); |
| 49 | @@ -2408,12 +2430,17 @@ wl_bss_roaming_done(struct wl_cfg80211_p | |
| 50 | return err; | |
| 51 | ||
| 60301872 JR |
52 | cfg80211_roamed(ndev, |
| 53 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) | |
| 54 | + &roam_info, | |
| 55 | +#else | |
| 56 | #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) | |
| 57 | &wl->conf->channel, | |
| 58 | #endif | |
| 59 | (u8 *)&wl->bssid, | |
| 60 | conn_info->req_ie, conn_info->req_ie_len, | |
| 61 | - conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); | |
| 62 | + conn_info->resp_ie, conn_info->resp_ie_len, | |
| 63 | +#endif | |
| 64 | + GFP_KERNEL); | |
| 65 | WL_DBG(("Report roaming result\n")); | |
| 66 | ||
| 67 | set_bit(WL_STATUS_CONNECTED, &wl->status); |