96 lines
3.8 KiB
Diff
96 lines
3.8 KiB
Diff
--- a/os_dep/linux/ioctl_cfg80211.c
|
|
+++ b/os_dep/linux/ioctl_cfg80211.c
|
|
@@ -438,9 +438,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte
|
|
ret = rtw_chbw_to_cfg80211_chan_def(wiphy, &chdef, ch, bw, offset, ht);
|
|
if (ret != _SUCCESS)
|
|
goto exit;
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0))
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)) && !defined(BUILD_OPENWRT)
|
|
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
|
|
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
|
|
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2)) || defined(BUILD_OPENWRT)
|
|
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
|
|
#else
|
|
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
|
|
@@ -1114,7 +1114,7 @@ check_bss:
|
|
#endif
|
|
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)) || defined(BUILD_OPENWRT)
|
|
roam_info.links[0].bssid = cur_network->network.MacAddress;
|
|
#else
|
|
roam_info.bssid = cur_network->network.MacAddress;
|
|
@@ -1681,7 +1681,7 @@ exit:
|
|
}
|
|
|
|
static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT)
|
|
,int link_id
|
|
#endif
|
|
, u8 key_index
|
|
@@ -1828,7 +1828,7 @@ addkey_end:
|
|
}
|
|
|
|
static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT)
|
|
,int link_id
|
|
#endif
|
|
, u8 keyid
|
|
@@ -1996,7 +1996,7 @@ exit:
|
|
}
|
|
|
|
static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT)
|
|
int link_id,
|
|
#endif
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
|
@@ -2020,7 +2020,7 @@ static int cfg80211_rtw_del_key(struct w
|
|
|
|
static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
|
|
struct net_device *ndev,
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT)
|
|
int link_id,
|
|
#endif
|
|
u8 key_index
|
|
@@ -2072,7 +2072,7 @@ static int cfg80211_rtw_set_default_key(
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30))
|
|
int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy,
|
|
struct net_device *ndev,
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT)
|
|
int link_id,
|
|
#endif
|
|
u8 key_index)
|
|
@@ -5148,7 +5148,7 @@ exit:
|
|
return ret;
|
|
}
|
|
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) || defined(BUILD_OPENWRT)
|
|
static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
|
|
struct cfg80211_ap_update *params)
|
|
{
|
|
@@ -5167,7 +5167,7 @@ static int cfg80211_rtw_change_beacon(st
|
|
|
|
return ret;
|
|
}
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2)) || defined(BUILD_OPENWRT)
|
|
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)
|
|
@@ -10270,7 +10270,7 @@ void rtw_wdev_unregister(struct wireless
|
|
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 (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2)) || defined(BUILD_OPENWRT)
|
|
if (wdev->connected) {
|
|
#else
|
|
if (wdev->current_bss) {
|