Skip to content

Commit

Permalink
rtl8188eu: Fix builds for kernel 6.0
Browse files Browse the repository at this point in the history
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
  • Loading branch information
lwfinger committed Aug 12, 2022
1 parent 318a5f1 commit 0a5e815
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions ioctl_cfg80211.c
Expand Up @@ -706,8 +706,13 @@ void rtw_cfg80211_indicate_connect(_adapter *padapter)

RTW_INFO(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter));
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
roam_info.channel = notify_channel;
roam_info.bssid = cur_network->network.MacAddress;
#else
roam_info.links[0].channel = notify_channel;
roam_info.links[0].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 =
Expand Down Expand Up @@ -4070,7 +4075,11 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
return ret;
}

#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
#else
static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id)
#endif
{
RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0;
Expand Down Expand Up @@ -6974,7 +6983,11 @@ void rtw_wdev_unregister(struct wireless_dev *wdev)
rtw_cfg80211_indicate_scan_done(adapter, true);

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0))
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
if (wdev->current_bss) {
#else
if (wdev->connected) {
#endif
u8 locally_generated = 1;
RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter));
cfg80211_disconnected(adapter->pnetdev, 0, NULL, 0, locally_generated, GFP_ATOMIC);
Expand Down

0 comments on commit 0a5e815

Please sign in to comment.