This is a new band defined in the WiFi 6E (ax) amendment. A completely new value is needed due to channel reuse between 2.4/5 and 6GHz. util.c needed minimal updating to prevent compile errors which will be fixed later to actually handle this band. WSC also needed a case added for 6GHz but the spec does not outline any RF Band value for 6GHz so the 5GHz value will be returned in this case. --- src/band.c | 3 ++- src/band.h | 1 + src/util.c | 4 ++++ src/wsc.c | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/band.c b/src/band.c index 053f85d6..1eb94586 100644 --- a/src/band.c +++ b/src/band.c @@ -1092,10 +1092,11 @@ static const uint8_t oper_class_jp_to_global[] = { /* 128 - 130 is a 1 to 1 mapping */ }; -/* Annex E, table E-4 (only 2.4GHz and 4.9 / 5GHz bands) */ +/* Annex E, table E-4 (only 2.4GHz, 4.9 / 5GHz, and 6GHz bands) */ static const enum band_freq oper_class_to_band_global[] = { [81 ... 84] = BAND_FREQ_2_4_GHZ, [104 ... 130] = BAND_FREQ_5_GHZ, + [131 ... 136] = BAND_FREQ_6_GHZ, }; /* Annex E, table E-5 */ diff --git a/src/band.h b/src/band.h index 2320bbcf..7b9e901f 100644 --- a/src/band.h +++ b/src/band.h @@ -39,6 +39,7 @@ enum band_chandef_width { enum band_freq { BAND_FREQ_2_4_GHZ = 0x1, BAND_FREQ_5_GHZ = 0x2, + BAND_FREQ_6_GHZ = 0x4, }; struct band_chandef { diff --git a/src/util.c b/src/util.c index 20e179a6..16df59ac 100644 --- a/src/util.c +++ b/src/util.c @@ -347,6 +347,8 @@ bool scan_freq_set_add(struct scan_freq_set *freqs, uint32_t freq) return true; case BAND_FREQ_5_GHZ: return l_uintset_put(freqs->channels_5ghz, channel); + case BAND_FREQ_6_GHZ: + return false; } return false; @@ -366,6 +368,8 @@ bool scan_freq_set_contains(const struct scan_freq_set *freqs, uint32_t freq) return freqs->channels_2ghz & (1 << (channel - 1)); case BAND_FREQ_5_GHZ: return l_uintset_contains(freqs->channels_5ghz, channel); + case BAND_FREQ_6_GHZ: + return false; } return false; diff --git a/src/wsc.c b/src/wsc.c index 0457ebf7..bb9f663b 100644 --- a/src/wsc.c +++ b/src/wsc.c @@ -308,6 +308,7 @@ static inline enum wsc_rf_band freq_to_rf_band(uint32_t freq) case BAND_FREQ_2_4_GHZ: return WSC_RF_BAND_2_4_GHZ; case BAND_FREQ_5_GHZ: + case BAND_FREQ_6_GHZ: return WSC_RF_BAND_5_0_GHZ; } -- 2.34.1

The 6GHz channels are stored and accessed identically to 5GHz, just using a separate uintset object. --- src/util.c | 53 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/src/util.c b/src/util.c index 16df59ac..2832486d 100644 --- a/src/util.c +++ b/src/util.c @@ -314,6 +314,7 @@ bool util_ip_prefix_tohl(const char *ip, uint8_t *prefix_out, struct scan_freq_set { uint16_t channels_2ghz; struct l_uintset *channels_5ghz; + struct l_uintset *channels_6ghz; }; struct scan_freq_set *scan_freq_set_new(void) @@ -322,6 +323,7 @@ struct scan_freq_set *scan_freq_set_new(void) /* 802.11-2012, 8.4.2.10 hints that 200 is the largest channel number */ ret->channels_5ghz = l_uintset_new_from_range(1, 200); + ret->channels_6ghz = l_uintset_new_from_range(1, 233); return ret; } @@ -329,6 +331,7 @@ struct scan_freq_set *scan_freq_set_new(void) void scan_freq_set_free(struct scan_freq_set *freqs) { l_uintset_free(freqs->channels_5ghz); + l_uintset_free(freqs->channels_6ghz); l_free(freqs); } @@ -348,7 +351,7 @@ bool scan_freq_set_add(struct scan_freq_set *freqs, uint32_t freq) case BAND_FREQ_5_GHZ: return l_uintset_put(freqs->channels_5ghz, channel); case BAND_FREQ_6_GHZ: - return false; + return l_uintset_put(freqs->channels_6ghz, channel); } return false; @@ -369,7 +372,7 @@ bool scan_freq_set_contains(const struct scan_freq_set *freqs, uint32_t freq) case BAND_FREQ_5_GHZ: return l_uintset_contains(freqs->channels_5ghz, channel); case BAND_FREQ_6_GHZ: - return false; + return l_uintset_contains(freqs->channels_6ghz, channel); } return false; @@ -388,10 +391,15 @@ uint32_t scan_freq_set_get_bands(struct scan_freq_set *freqs) if (l_uintset_find_min(freqs->channels_5ghz) <= max) bands |= BAND_FREQ_5_GHZ; + max = l_uintset_get_max(freqs->channels_6ghz); + + if (l_uintset_find_min(freqs->channels_6ghz) <= max) + bands |= BAND_FREQ_6_GHZ; + return bands; } -static void scan_channels_5ghz_add(uint32_t channel, void *user_data) +static void scan_channels_add(uint32_t channel, void *user_data) { struct l_uintset *to = user_data; @@ -403,37 +411,41 @@ void scan_freq_set_merge(struct scan_freq_set *to, { to->channels_2ghz |= from->channels_2ghz; - l_uintset_foreach(from->channels_5ghz, scan_channels_5ghz_add, + l_uintset_foreach(from->channels_5ghz, scan_channels_add, to->channels_5ghz); + l_uintset_foreach(from->channels_6ghz, scan_channels_add, + to->channels_6ghz); } bool scan_freq_set_isempty(const struct scan_freq_set *set) { - if (set->channels_2ghz == 0 && l_uintset_isempty(set->channels_5ghz)) + if (set->channels_2ghz == 0 && l_uintset_isempty(set->channels_5ghz) && + l_uintset_isempty(set->channels_6ghz)) return true; return false; } -struct channels_5ghz_foreach_data { +struct channels_foreach_data { scan_freq_set_func_t func; + enum band_freq band; void *user_data; }; -static void scan_channels_5ghz_frequency(uint32_t channel, void *user_data) +static void scan_channels_foreach(uint32_t channel, void *user_data) { - const struct channels_5ghz_foreach_data *channels_5ghz_data = user_data; + const struct channels_foreach_data *channels_data = user_data; uint32_t freq; - freq = band_channel_to_freq(channel, BAND_FREQ_5_GHZ); + freq = band_channel_to_freq(channel, channels_data->band); - channels_5ghz_data->func(freq, channels_5ghz_data->user_data); + channels_data->func(freq, channels_data->user_data); } void scan_freq_set_foreach(const struct scan_freq_set *freqs, scan_freq_set_func_t func, void *user_data) { - struct channels_5ghz_foreach_data data = { }; + struct channels_foreach_data data = { }; uint8_t channel; uint32_t freq; @@ -441,10 +453,14 @@ void scan_freq_set_foreach(const struct scan_freq_set *freqs, return; data.func = func; + data.band = BAND_FREQ_5_GHZ; data.user_data = user_data; - l_uintset_foreach(freqs->channels_5ghz, scan_channels_5ghz_frequency, - &data); + l_uintset_foreach(freqs->channels_5ghz, scan_channels_foreach, &data); + + data.band = BAND_FREQ_6_GHZ; + + l_uintset_foreach(freqs->channels_6ghz, scan_channels_foreach, &data); if (!freqs->channels_2ghz) return; @@ -472,6 +488,14 @@ void scan_freq_set_constrain(struct scan_freq_set *set, l_uintset_free(set->channels_5ghz); set->channels_5ghz = intersection; + intersection = l_uintset_intersect(constraint->channels_6ghz, + set->channels_6ghz); + if (!intersection) + return; + + l_uintset_free(set->channels_6ghz); + set->channels_6ghz = intersection; + set->channels_2ghz &= constraint->channels_2ghz; } @@ -491,7 +515,8 @@ uint32_t *scan_freq_set_to_fixed_array(const struct scan_freq_set *set, uint32_t *freqs; count = __builtin_popcount(set->channels_2ghz) + - l_uintset_size(set->channels_5ghz); + l_uintset_size(set->channels_5ghz) + + l_uintset_size(set->channels_6ghz); if (!count) return NULL; -- 2.34.1

The 802.11ax standards adds some restrictions for the 6GHz band. In short stations must use SAE, OWE, or 8021x on this band and frame protection is required. --- src/network.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/network.c b/src/network.c index 4e7af27c..a970f81f 100644 --- a/src/network.c +++ b/src/network.c @@ -55,6 +55,7 @@ #include "src/util.h" #include "src/erp.h" #include "src/handshake.h" +#include "src/band.h" #define SAE_PT_SETTING "SAE-PT-Group%u" @@ -774,6 +775,7 @@ int network_can_connect_bss(struct network *network, const struct scan_bss *bss) struct network_config *config = info ? &info->config : NULL; bool can_transition_disable = wiphy_can_transition_disable(wiphy); struct ie_rsn_info rsn; + enum band_freq band; int ret; switch (security) { @@ -785,6 +787,9 @@ int network_can_connect_bss(struct network *network, const struct scan_bss *bss) return -ENOSYS; } + if (!band_freq_to_channel(bss->frequency, &band)) + return -ENOTSUP; + memset(&rsn, 0, sizeof(rsn)); ret = scan_bss_get_rsn_info(bss, &rsn); if (ret < 0) { @@ -797,6 +802,13 @@ int network_can_connect_bss(struct network *network, const struct scan_bss *bss) * We assume the spec means us to check bit 3 here */ if (ret == -ENOENT && security == SECURITY_NONE) { + /* + * 802.11ax 12.12.2 - STA shall not use Open System + * authentication without encryption + */ + if (band == BAND_FREQ_6_GHZ) + return -EPERM; + if (!config) return 0; @@ -852,6 +864,31 @@ int network_can_connect_bss(struct network *network, const struct scan_bss *bss) } no_transition_disable: + /* 802.11ax Section 12.12.2 */ + if (band == BAND_FREQ_6_GHZ) { + /* STA shall not use the following cipher suite selectors */ + rsn.pairwise_ciphers &= ~IE_RSN_CIPHER_SUITE_USE_GROUP_CIPHER; + rsn.pairwise_ciphers &= ~IE_RSN_CIPHER_SUITE_TKIP; + + /* STA shall not use the following AKM suite selectors */ + rsn.akm_suites &= ~IE_RSN_AKM_SUITE_PSK; + rsn.akm_suites &= ~IE_RSN_AKM_SUITE_PSK_SHA256; + rsn.akm_suites &= ~IE_RSN_AKM_SUITE_FT_USING_PSK; + + /* Basically the STA must use OWE, SAE, or 8021x */ + if (!(rsn.akm_suites & (IE_RSN_AKM_SUITE_8021X | + IE_RSN_AKM_SUITE_FT_OVER_8021X | + IE_RSN_AKM_SUITE_8021X_SHA256 | + IE_RSN_AKM_SUITE_SAE_SHA256 | + IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 | + IE_RSN_AKM_SUITE_FT_OVER_8021X_SHA384 | + IE_RSN_AKM_SUITE_OWE))) + return -EPERM; + + /* STA shall use management frame protection */ + rsn.mfpr = true; + } + if (!wiphy_select_cipher(wiphy, rsn.pairwise_ciphers)) return -ENOTSUP; -- 2.34.1

On Fri, 2022-02-25 at 13:24 -0600, Denis Kenzior wrote: I avoided this because they all check for only a single AKM, which I guess we could modify, or add IE_AKM_HAS_* variants. Yes, I saw earlier in the function it was set but it looks like this was just for the group management cipher check at the bottom. I'll add something in station.c.

Tests that all valid channels/frequencies can be computed as well as oci_verify maps each new operating class to the correct chandef. --- unit/test-band.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/unit/test-band.c b/unit/test-band.c index 0de1fdee..757db377 100644 --- a/unit/test-band.c +++ b/unit/test-band.c @@ -331,6 +331,33 @@ static const struct band_chandef cd_4 = { .center1_frequency = 2427, }; +static const struct band_chandef cd_5 = { + .frequency = 6235, + .channel_width = BAND_CHANDEF_WIDTH_20, +}; + +static const struct band_chandef cd_6 = { + .frequency = 6235, + .channel_width = BAND_CHANDEF_WIDTH_40, +}; + +static const struct band_chandef cd_7 = { + .frequency = 6235, + .channel_width = BAND_CHANDEF_WIDTH_80, +}; + +static const struct band_chandef cd_8 = { + .frequency = 6235, + .channel_width = BAND_CHANDEF_WIDTH_160, +}; + +static const struct band_chandef cd_9 = { + .frequency = 6235, + .channel_width = BAND_CHANDEF_WIDTH_80P80, + .center1_frequency = 6145, + .center2_frequency = 6225, +}; + struct oci_data { const struct band_chandef *cd; uint8_t oci[3]; @@ -341,6 +368,11 @@ static const struct oci_data oci_data_1 = { &cd_1, { 129, 108, 0 } }; static const struct oci_data oci_data_2 = { &cd_2, { 130, 36, 155 } }; static const struct oci_data oci_data_3 = { &cd_3, { 81, 6, 0 } }; static const struct oci_data oci_data_4 = { &cd_4, { 84, 6, 0 } }; +static const struct oci_data oci_data_5 = { &cd_5, { 131, 57, 0 } }; +static const struct oci_data oci_data_6 = { &cd_6, { 132, 57, 0 } }; +static const struct oci_data oci_data_7 = { &cd_7, { 133, 57, 0 } }; +static const struct oci_data oci_data_8 = { &cd_8, { 134, 57, 0 } }; +static const struct oci_data oci_data_9 = { &cd_9, { 135, 57, 55 } }; static const struct oci_data oci_err_1 = { &cd_1, { 129, 36, 0 }, -EPERM }; static const struct oci_data oci_err_2 = { &cd_1, { 121, 108, 0 }, -EPERM }; @@ -372,6 +404,26 @@ static void test_oci_from_chandef(const void *data) assert(!memcmp(oci, test->oci, sizeof(oci))); } +static void test_6ghz_channels(const void *data) +{ + unsigned int i; + + /* Test all channels for 6GHz */ + for (i = 1; i <= 233; i += 4) + assert(band_channel_to_freq(i, BAND_FREQ_6_GHZ) != 0); +} + +static void test_6ghz_freqs(const void *data) +{ + uint32_t i; + enum band_freq band; + + for (i = 5955; i < 7115; i += 5) { + assert(band_freq_to_channel(i, &band) != 0); + assert(band == BAND_FREQ_6_GHZ); + } +} + int main(int argc, char *argv[]) { l_test_init(&argc, &argv); @@ -395,6 +447,11 @@ int main(int argc, char *argv[]) l_test_add("/band/oci/verify 2", test_oci_verify, &oci_data_2); l_test_add("/band/oci/verify 3", test_oci_verify, &oci_data_3); l_test_add("/band/oci/verify 4", test_oci_verify, &oci_data_4); + l_test_add("/band/oci/verify 5", test_oci_verify, &oci_data_5); + l_test_add("/band/oci/verify 6", test_oci_verify, &oci_data_6); + l_test_add("/band/oci/verify 7", test_oci_verify, &oci_data_7); + l_test_add("/band/oci/verify 8", test_oci_verify, &oci_data_8); + l_test_add("/band/oci/verify 9", test_oci_verify, &oci_data_9); l_test_add("/band/oci/noverify 1", test_oci_verify, &oci_err_1); l_test_add("/band/oci/noverify 2", test_oci_verify, &oci_err_2); @@ -410,5 +467,8 @@ int main(int argc, char *argv[]) l_test_add("/band/oci/chandef 3", test_oci_from_chandef, &oci_data_3); l_test_add("/band/oci/chandef 4", test_oci_from_chandef, &oci_data_4); + l_test_add("/band/6ghz/channels", test_6ghz_channels, NULL); + l_test_add("/band/6ghz/freq", test_6ghz_freqs, NULL); + return l_test_run(); } -- 2.34.1

This aids in debugging if iwd/hostapd/etc fail to start correctly. --- tools/test-runner | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/test-runner b/tools/test-runner index 64407a41..0b749238 100755 --- a/tools/test-runner +++ b/tools/test-runner @@ -1327,6 +1327,11 @@ def pre_test(ctx, test, copied): subtests = pruned + if ctx.args.log: + ctx.start_process(['iwmon', '--nowiphy']) + elif ctx.args.monitor: + ctx.start_process(['iwmon'], outfile=ctx.args.monitor) + ctx.start_dbus() ctx.start_haveged() ctx.start_dbus_monitor() @@ -1336,11 +1341,6 @@ def pre_test(ctx, test, copied): ctx.start_wpas_interfaces() ctx.start_ofono() - if ctx.args.log: - ctx.start_process(['iwmon', '--nowiphy']) - elif ctx.args.monitor: - ctx.start_process(['iwmon', '--nowiphy'], outfile=ctx.args.monitor) - if ctx.hw_config.has_option('SETUP', 'start_iwd'): start = ctx.hw_config.getboolean('SETUP', 'start_iwd') else: -- 2.34.1