64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
--- 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 | WL_DBG_I
|
|
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 @@ 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);
|
|
@@ -2361,12 +2370,26 @@ 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_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 @@ wl_bss_roaming_done(struct wl_cfg80211_p
|
|
(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);
|