From eb52ece92607394ecc22e96b41671ec3e5b1fa30 Mon Sep 17 00:00:00 2001 From: morrownr Date: Sun, 26 Nov 2023 13:04:38 -0600 Subject: [PATCH] fix support for kernel 6.7 --- os_dep/linux/ioctl_cfg80211.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index f98ee71..bc8d21d 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -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_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); -#endif exit: return ret; } @@ -5453,7 +5449,7 @@ exit: static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) - struct cfg80211_ap_update *ap) + struct cfg80211_ap_update *info) #else struct cfg80211_beacon_data *info) #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); #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) 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); #endif