minoplhy/88x2bu-20210702
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup support for kernel 6.7

Browse Source
This commit is contained in:
morrownr 2023-11-26 15:28:17 -06:00
parent 3345192bb8
commit 305a9123d9
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
os_dep/linux/ioctl_cfg80211.c
View File

@ -5321,11 +5321,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;
} }
@ -5410,9 +5406,9 @@ 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
{ {
int ret = 0; int ret = 0;
@ -5421,7 +5417,7 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) #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); ret = rtw_add_beacon(adapter, info->beacon.head, info->beacon.head_len, info->beacon.tail, info->beacon.tail_len);
#else #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