|
|
|
|
@ -417,7 +417,11 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8
|
|
|
|
|
if (ret != _SUCCESS)
|
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2))
|
|
|
|
|
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
|
|
|
|
|
#else
|
|
|
|
|
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
int freq = rtw_ch2freq(ch);
|
|
|
|
|
@ -429,8 +433,12 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ctype = rtw_chbw_to_nl80211_channel_type(ch, bw, offset, ht);
|
|
|
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2))
|
|
|
|
|
cfg80211_ch_switch_notify(adapter->pnetdev, freq, ctype, 0);
|
|
|
|
|
#else
|
|
|
|
|
cfg80211_ch_switch_notify(adapter->pnetdev, freq, ctype);
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
exit:
|
|
|
|
|
return ret;
|
|
|
|
|
@ -1085,7 +1093,11 @@ check_bss:
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
|
|
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
|
|
|
|
|
roam_info.links[0].bssid = cur_network->network.MacAddress;
|
|
|
|
|
#else
|
|
|
|
|
roam_info.bssid = cur_network->network.MacAddress;
|
|
|
|
|
#endif
|
|
|
|
|
roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2;
|
|
|
|
|
roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2;
|
|
|
|
|
roam_info.resp_ie = pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6;
|
|
|
|
|
@ -4929,7 +4941,12 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2))
|
|
|
|
|
static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev,
|
|
|
|
|
unsigned int link_id)
|
|
|
|
|
#else
|
|
|
|
|
static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
|
|
|
|
|
|
|
|
|
|
@ -9679,7 +9696,11 @@ void rtw_wdev_unregister(struct wireless_dev *wdev)
|
|
|
|
|
rtw_cfg80211_indicate_scan_done(adapter, _TRUE);
|
|
|
|
|
|
|
|
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE)
|
|
|
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2))
|
|
|
|
|
if (wdev->links[0].client.current_bss) {
|
|
|
|
|
#else
|
|
|
|
|
if (wdev->current_bss) {
|
|
|
|
|
#endif
|
|
|
|
|
RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter));
|
|
|
|
|
rtw_cfg80211_indicate_disconnect(adapter, 0, 1);
|
|
|
|
|
}
|
|
|
|
|
|