[][MAC80211][hostapd][Fix ZW-DFS feature]
[Description]
Fix ZW-DFS feature in MAC80211
Hostapd v2.10 doesn't include ZW-DFS changes
Add hostapd ZW-DFS upstream patches from 800 to 811.
Synchronize nl80211 header difination sync in backport and hostapd
[Release-log]
N/A
Change-Id: I2a5c49bd822408788d8960c9090ebf27740d94ee
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6079111
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/803-DFS-Rely-on-channel_type-in-dfs_downgrade_bandwidth.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/803-DFS-Rely-on-channel_type-in-dfs_downgrade_bandwidth.patch
new file mode 100644
index 0000000..9c5d850
--- /dev/null
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/803-DFS-Rely-on-channel_type-in-dfs_downgrade_bandwidth.patch
@@ -0,0 +1,135 @@
+From 18111f0a47b33da2f75cebd65f9201150bc3a1a9 Mon Sep 17 00:00:00 2001
+From: dzou <dzou@company.com>
+Date: Sun, 5 Jun 2022 23:18:45 +0800
+Subject: [PATCH 903/911] DFS: Rely on channel_type in
+ dfs_downgrade_bandwidth()
+
+Add the capability to specify all 3 channel type possibilities in
+dfs_downgrade_bandwidth(). This is a preliminary change to introduce
+radar/CAC background detection support.
+
+Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
+---
+ src/ap/dfs.c | 32 +++++++++++++++-----------------
+ 1 file changed, 15 insertions(+), 17 deletions(-)
+
+diff --git a/src/ap/dfs.c b/src/ap/dfs.c
+index 56564b901..05cb63ac4 100644
+--- a/src/ap/dfs.c
++++ b/src/ap/dfs.c
+@@ -987,7 +987,8 @@ int hostapd_dfs_pre_cac_expired(struct hostapd_iface *iface, int freq,
+ static struct hostapd_channel_data *
+ dfs_downgrade_bandwidth(struct hostapd_iface *iface, int *secondary_channel,
+ u8 *oper_centr_freq_seg0_idx,
+- u8 *oper_centr_freq_seg1_idx, int *skip_radar)
++ u8 *oper_centr_freq_seg1_idx,
++ enum dfs_channel_type *channel_type)
+ {
+ struct hostapd_channel_data *channel;
+
+@@ -995,23 +996,22 @@ dfs_downgrade_bandwidth(struct hostapd_iface *iface, int *secondary_channel,
+ channel = dfs_get_valid_channel(iface, secondary_channel,
+ oper_centr_freq_seg0_idx,
+ oper_centr_freq_seg1_idx,
+- *skip_radar ? DFS_AVAILABLE :
+- DFS_ANY_CHANNEL);
++ *channel_type);
+ if (channel) {
+ wpa_printf(MSG_DEBUG, "DFS: Selected channel: %d",
+ channel->chan);
+ return channel;
+ }
+
+- if (*skip_radar) {
+- *skip_radar = 0;
++ if (*channel_type != DFS_ANY_CHANNEL) {
++ *channel_type = DFS_ANY_CHANNEL;
+ } else {
+ int oper_chwidth;
+
+ oper_chwidth = hostapd_get_oper_chwidth(iface->conf);
+ if (oper_chwidth == CHANWIDTH_USE_HT)
+ break;
+- *skip_radar = 1;
++ *channel_type = DFS_AVAILABLE;
+ hostapd_set_oper_chwidth(iface->conf, oper_chwidth - 1);
+ }
+ }
+@@ -1029,7 +1029,7 @@ static int hostapd_dfs_start_channel_switch_cac(struct hostapd_iface *iface)
+ int secondary_channel;
+ u8 oper_centr_freq_seg0_idx = 0;
+ u8 oper_centr_freq_seg1_idx = 0;
+- int skip_radar = 0;
++ enum dfs_channel_type channel_type = DFS_ANY_CHANNEL;
+ int err = 1;
+
+ /* Radar detected during active CAC */
+@@ -1037,14 +1037,13 @@ static int hostapd_dfs_start_channel_switch_cac(struct hostapd_iface *iface)
+ channel = dfs_get_valid_channel(iface, &secondary_channel,
+ &oper_centr_freq_seg0_idx,
+ &oper_centr_freq_seg1_idx,
+- skip_radar ? DFS_AVAILABLE :
+- DFS_ANY_CHANNEL);
++ channel_type);
+
+ if (!channel) {
+ channel = dfs_downgrade_bandwidth(iface, &secondary_channel,
+ &oper_centr_freq_seg0_idx,
+ &oper_centr_freq_seg1_idx,
+- &skip_radar);
++ &channel_type);
+ if (!channel) {
+ wpa_printf(MSG_ERROR, "No valid channel available");
+ return err;
+@@ -1078,7 +1077,7 @@ static int hostapd_dfs_start_channel_switch(struct hostapd_iface *iface)
+ u8 oper_centr_freq_seg0_idx;
+ u8 oper_centr_freq_seg1_idx;
+ u8 new_vht_oper_chwidth;
+- int skip_radar = 1;
++ enum dfs_channel_type channel_type = DFS_AVAILABLE;
+ struct csa_settings csa_settings;
+ unsigned int i;
+ int err = 1;
+@@ -1103,14 +1102,13 @@ static int hostapd_dfs_start_channel_switch(struct hostapd_iface *iface)
+ * uniform spreading.
+ */
+ if (iface->dfs_domain == HOSTAPD_DFS_REGION_ETSI)
+- skip_radar = 0;
++ channel_type = DFS_ANY_CHANNEL;
+
+ /* Perform channel switch/CSA */
+ channel = dfs_get_valid_channel(iface, &secondary_channel,
+ &oper_centr_freq_seg0_idx,
+ &oper_centr_freq_seg1_idx,
+- skip_radar ? DFS_AVAILABLE :
+- DFS_ANY_CHANNEL);
++ channel_type);
+
+ if (!channel) {
+ /*
+@@ -1118,11 +1116,11 @@ static int hostapd_dfs_start_channel_switch(struct hostapd_iface *iface)
+ * there is another channel where we can switch even if it
+ * requires to perform a CAC first.
+ */
+- skip_radar = 0;
++ channel_type = DFS_ANY_CHANNEL;
+ channel = dfs_downgrade_bandwidth(iface, &secondary_channel,
+ &oper_centr_freq_seg0_idx,
+ &oper_centr_freq_seg1_idx,
+- &skip_radar);
++ &channel_type);
+ if (!channel) {
+ /*
+ * Toggle interface state to enter DFS state
+@@ -1133,7 +1131,7 @@ static int hostapd_dfs_start_channel_switch(struct hostapd_iface *iface)
+ return 0;
+ }
+
+- if (!skip_radar) {
++ if (channel_type == DFS_ANY_CHANNEL) {
+ iface->freq = channel->freq;
+ iface->conf->channel = channel->chan;
+ iface->conf->secondary_channel = secondary_channel;
+--
+2.29.2
+