mirror of
https://github.com/morrownr/8821cu-20210916.git
synced 2024-11-22 05:24:47 +00:00
fix support for kernel 6.7
This commit is contained in:
parent
2b48616df2
commit
eb52ece926
@ -5326,11 +5326,7 @@ static int cfg80211_rtw_add_beacon(struct wiphy *wiphy, struct net_device *ndev,
|
|||||||
}
|
}
|
||||||
rtw_mi_scan_abort(adapter, _TRUE);
|
rtw_mi_scan_abort(adapter, _TRUE);
|
||||||
rtw_mi_buddy_set_scan_deny(adapter, 300);
|
rtw_mi_buddy_set_scan_deny(adapter, 300);
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
|
|
||||||
ret = rtw_add_beacon(adapter, ap->beacon.head, ap->beacon.head_len, ap->beacon.tail, ap->beacon.tail_len);
|
|
||||||
#else
|
|
||||||
ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
|
ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
|
||||||
#endif
|
|
||||||
exit:
|
exit:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -5453,7 +5449,7 @@ exit:
|
|||||||
|
|
||||||
static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
|
static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
|
||||||
struct cfg80211_ap_update *ap)
|
struct cfg80211_ap_update *info)
|
||||||
#else
|
#else
|
||||||
struct cfg80211_beacon_data *info)
|
struct cfg80211_beacon_data *info)
|
||||||
#endif
|
#endif
|
||||||
@ -5473,12 +5469,15 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
|
|||||||
rtw_cfg80211_set_proberesp_ies(ndev, info->proberesp_ies, info->proberesp_ies_len);
|
rtw_cfg80211_set_proberesp_ies(ndev, info->proberesp_ies, info->proberesp_ies_len);
|
||||||
#endif /* not_yet */
|
#endif /* not_yet */
|
||||||
|
|
||||||
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
|
||||||
|
if (info->beacon.assocresp_ies_len > 0)
|
||||||
|
rtw_cfg80211_set_assocresp_ies(ndev, info->beacon.assocresp_ies, info->beacon.assocresp_ies_len);
|
||||||
|
|
||||||
|
ret = rtw_add_beacon(adapter, info->beacon.head, info->beacon.head_len, info->beacon.tail, info->beacon.tail_len);
|
||||||
|
#else
|
||||||
if (info->assocresp_ies_len > 0)
|
if (info->assocresp_ies_len > 0)
|
||||||
rtw_cfg80211_set_assocresp_ies(ndev, info->assocresp_ies, info->assocresp_ies_len);
|
rtw_cfg80211_set_assocresp_ies(ndev, info->assocresp_ies, info->assocresp_ies_len);
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
|
|
||||||
ret = rtw_add_beacon(adapter, ap->beacon.head, ap->beacon.head_len, ap->beacon.tail, ap->beacon.tail_len);
|
|
||||||
#else
|
|
||||||
ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
|
ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user