[][MAC80211][WiFi6/7][iw][Add support for 5G U-NII-3 & 4 setting without specifying center]
[Description]
Add support for 5G U-NII-3 setting without specifying center freq
Fix 6G freq typo (6195 --> 6915)
[Release-log]
N/A
Change-Id: If6d025a16ae736b0f9e8da498c332b584844aa15
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/8140432
diff --git a/autobuild_mac80211_release/package/network/utils/iw/patches/1000-Add-support-to-set-control-and-center-freq-for-6G-BW.patch b/autobuild_mac80211_release/package/network/utils/iw/patches/1000-Add-support-for-5G-U-NII-3-6G-BW320.patch
similarity index 62%
rename from autobuild_mac80211_release/package/network/utils/iw/patches/1000-Add-support-to-set-control-and-center-freq-for-6G-BW.patch
rename to autobuild_mac80211_release/package/network/utils/iw/patches/1000-Add-support-for-5G-U-NII-3-6G-BW320.patch
index 5f33379..a69e063 100644
--- a/autobuild_mac80211_release/package/network/utils/iw/patches/1000-Add-support-to-set-control-and-center-freq-for-6G-BW.patch
+++ b/autobuild_mac80211_release/package/network/utils/iw/patches/1000-Add-support-for-5G-U-NII-3-6G-BW320.patch
@@ -1,14 +1,13 @@
-From 900d6f16849bcc9d1cd6c0794da1d6d9a63ad11e Mon Sep 17 00:00:00 2001
+From ed0fd20be0b27d0f3f95819228c87c771a8c3c43 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Thu, 2 Mar 2023 10:07:05 +0800
-Subject: [PATCH] Add support to set control and center freq for 6G
- BW320
+Subject: [PATCH] Add support for 5G U-NII-3 & 6G BW320
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
- phy.c | 4 ++--
- util.c | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ phy.c | 4 ++--
+ util.c | 11 ++++++-----
+ 2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/phy.c b/phy.c
index 2d489ef..4fa66b7 100644
@@ -31,7 +30,7 @@
static int handle_chan(struct nl80211_state *state, struct nl_msg *msg,
diff --git a/util.c b/util.c
-index 8a2ba10..93269ab 100644
+index 8a2ba10..7126ce8 100644
--- a/util.c
+++ b/util.c
@@ -471,6 +471,7 @@ enum nl80211_chan_width str_to_bw(const char *str)
@@ -42,6 +41,23 @@
};
unsigned int i;
+@@ -1690,11 +1691,11 @@ int get_cf1(const struct chanmode *chanmode, unsigned long freq)
+ {
+ unsigned int cf1 = freq, j;
+ unsigned int bw80[] = { 5180, 5260, 5500, 5580, 5660, 5745,
+- 5955, 6035, 6115, 6195, 6275, 6355,
+- 6435, 6515, 6595, 6675, 6755, 6835,
+- 6195, 6995 };
+- unsigned int bw160[] = { 5180, 5500, 5955, 6115, 6275, 6435,
+- 6595, 6755, 6915 };
++ 5825, 5955, 6035, 6115, 6195, 6275,
++ 6355, 6435, 6515, 6595, 6675, 6755,
++ 6835, 6915, 6995 };
++ unsigned int bw160[] = { 5180, 5500, 5745, 5955, 6115, 6275,
++ 6435, 6595, 6755, 6915 };
+
+ switch (chanmode->width) {
+ case NL80211_CHAN_WIDTH_80:
--
2.18.0