iw: enable 80MHz support for 6GHz band 11s mesh
without this 11s mesh could not be configured with bandwidth 80MHz
in 6G band using iw. Also, this will be required to set frequency
for 6GHz band in 80MHz.
example:
iw <interface> mesh join <meshname> freq 6195 80MHz
Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Link: https://lore.kernel.org/r/1602283770-8026-2-git-send-email-pradeepc@codeaurora.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
diff --git a/util.c b/util.c
index 0a9083c..3f1b787 100644
--- a/util.c
+++ b/util.c
@@ -1236,21 +1236,24 @@
int get_cf1(const struct chanmode *chanmode, unsigned long freq)
{
unsigned int cf1 = freq, j;
- unsigned int vht80[] = { 5180, 5260, 5500, 5580, 5660, 5745 };
+ 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 vht160[] = { 5180, 5500 };
switch (chanmode->width) {
case NL80211_CHAN_WIDTH_80:
/* setup center_freq1 */
- for (j = 0; j < ARRAY_SIZE(vht80); j++) {
- if (freq >= vht80[j] && freq < vht80[j] + 80)
+ for (j = 0; j < ARRAY_SIZE(bw80); j++) {
+ if (freq >= bw80[j] && freq < bw80[j] + 80)
break;
}
- if (j == ARRAY_SIZE(vht80))
+ if (j == ARRAY_SIZE(bw80))
break;
- cf1 = vht80[j] + 30;
+ cf1 = bw80[j] + 30;
break;
case NL80211_CHAN_WIDTH_160:
/* setup center_freq1 */
