Enhance get_mode() to return correct hw_mode with 6 GHz support

The 5 GHz channels are stored in one hw_features set with mode
HOSTAPD_MODE_IEEE80211A while the 6 GHz channels will need to be stored
in a separate hw_features set (but with same mode
HOSTAPD_MODE_IEEE80211A) due to possibility of different HT/VHT/HE
capabilities being available between the 5 GHz and 6 GHz bands.

Iterate through all hw_features sets and check and match the band of
channel supported by the hw_features set while getting the hw_features
set in get_mode(). This allows both the 5 GHz and 6 GHz channels to be
found and correct capabilities to be used in cases where the driver
reports different capability values between 5 and 6 GHz channels.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

diff --git a/wpa_supplicant/op_classes.c b/wpa_supplicant/op_classes.c
index b15ac9e3247324d1ec0498b75b457f1a13aec9c4..f49bdb0945dfaf32f6399803998bd45fd5159d61 100644 (file)
--- a/wpa_supplicant/op_classes.c
+++ b/wpa_supplicant/op_classes.c
@@ -228,7 +228,8 @@ static int wpas_op_class_supported(struct wpa_supplicant *wpa_s,
        int freq2 = 0;
        int freq5 = 0;
 
-       mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, op_class->mode);
+       mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, op_class->mode,
+                       is_6ghz_op_class(op_class->op_class));
        if (!mode)
                return 0;
 

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 8237242a753e166f1f8d17ce971901280a025c64..974e3e0ed176a7b26057b04a360275f3a08f8b4d 100644 (file)
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -1912,7 +1912,7 @@ static int wpas_p2p_freq_to_edmg_channel(struct wpa_supplicant *wpa_s,
                return -1;
 
        hwmode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes,
-                         HOSTAPD_MODE_IEEE80211AD);
+                         HOSTAPD_MODE_IEEE80211AD, 0);
        if (!hwmode) {
                wpa_printf(MSG_ERROR,
                           "Unsupported AP mode: HOSTAPD_MODE_IEEE80211AD");
@@ -3725,7 +3725,8 @@ static int wpas_p2p_setup_channels(struct wpa_supplicant *wpa_s,
                if (o->p2p == NO_P2P_SUPP)
                        continue;
 
-               mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, o->mode);
+               mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, o->mode,
+                               is_6ghz_op_class(o->op_class));
                if (mode == NULL)
                        continue;
                if (mode->mode == HOSTAPD_MODE_IEEE80211G)
@@ -6291,7 +6292,7 @@ static int wpas_p2p_init_go_params(struct wpa_supplicant *wpa_s,
                        cand = wpa_s->p2p_group_common_freqs[i];
                        mode = ieee80211_freq_to_chan(cand, &chan);
                        hwmode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes,
-                                         mode);
+                                         mode, is_6ghz_freq(cand));
                        if (!hwmode ||
                            wpas_p2p_verify_channel(wpa_s, hwmode, chan,
                                                    BW80) != ALLOWED)
@@ -6318,7 +6319,7 @@ static int wpas_p2p_init_go_params(struct wpa_supplicant *wpa_s,
                        cand = wpa_s->p2p_group_common_freqs[i];
                        mode = ieee80211_freq_to_chan(cand, &chan);
                        hwmode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes,
-                                         mode);
+                                         mode, is_6ghz_freq(cand));
                        if (!wpas_same_band(wpa_s->current_ssid->frequency,
                                            cand) ||
                            !hwmode ||

diff --git a/wpa_supplicant/rrm.c b/wpa_supplicant/rrm.c
index 7930e012b400ae68b7fe2df3749448eb758ed0bb..66855b8773624ce8c44ae270ddd3c2444490e0bc 100644 (file)
--- a/wpa_supplicant/rrm.c
+++ b/wpa_supplicant/rrm.c
@@ -609,7 +609,8 @@ static int * wpas_channel_report_freqs(struct wpa_supplicant *wpa_s, int active,
                pos++;
                left--;
 
-               mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, op->mode);
+               mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, op->mode,
+                               is_6ghz_op_class(op->op_class));
                if (!mode)
                        continue;
 
@@ -661,7 +662,8 @@ static int * wpas_beacon_request_freqs(struct wpa_supplicant *wpa_s,
                return NULL;
        }
 
-       mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, op->mode);
+       mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, op->mode,
+                       is_6ghz_op_class(op->op_class));
        if (!mode)
                return NULL;
 

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 205653a67b631caeee2da1c97f0c317d96fb70c2..c91517a454ac0b591977ae46fc5f897a30feaeab 100644 (file)
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -668,13 +668,14 @@ static int non_p2p_network_enabled(struct wpa_supplicant *wpa_s)
 
 static void wpa_setband_scan_freqs_list(struct wpa_supplicant *wpa_s,
                                        enum hostapd_hw_mode band,
-                                       struct wpa_driver_scan_params *params)
+                                       struct wpa_driver_scan_params *params,
+                                       int is_6ghz)
 {
        /* Include only supported channels for the specified band */
        struct hostapd_hw_modes *mode;
        int count, i;
 
-       mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, band);
+       mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, band, is_6ghz);
        if (mode == NULL) {
                /* No channels supported in this band - use empty list */
                params->freqs = os_zalloc(sizeof(int));
@@ -701,10 +702,10 @@ static void wpa_setband_scan_freqs(struct wpa_supplicant *wpa_s,
                return; /* already using a limited channel set */
        if (wpa_s->setband == WPA_SETBAND_5G)
                wpa_setband_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A,
-                                           params);
+                                           params, 0);
        else if (wpa_s->setband == WPA_SETBAND_2G)
                wpa_setband_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211G,
-                                           params);
+                                           params, 0);
 }
 
 

diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
index ea4bad2b45a9e6ef97e633fa3b6fa83ca1bee8a6..eafff1d6a174b185968dc011179d2fc79a9079a3 100644 (file)
--- a/wpa_supplicant/sme.c
+++ b/wpa_supplicant/sme.c
@@ -2339,7 +2339,7 @@ static void wpa_obss_scan_freqs_list(struct wpa_supplicant *wpa_s,
        int start, end;
 
        mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes,
-                       HOSTAPD_MODE_IEEE80211G);
+                       HOSTAPD_MODE_IEEE80211G, 0);
        if (mode == NULL) {
                /* No channels supported in this band - use empty list */
                params->freqs = os_zalloc(sizeof(int));

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 8cf148f90afa8983ae8e0509b495268308aeca74..aa7e1d09a271eec4d974921b17f56fca6d6d38f9 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -3249,7 +3249,7 @@ get_supported_edmg(struct wpa_supplicant *wpa_s,
        if (hw_mode == NUM_HOSTAPD_MODES)
                goto fail;
 
-       mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, hw_mode);
+       mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, hw_mode, 0);
        if (!mode)
                goto fail;
 
@@ -7727,12 +7727,17 @@ int wpas_vendor_elem_remove(struct wpa_supplicant *wpa_s, int frame,
 
 
 struct hostapd_hw_modes * get_mode(struct hostapd_hw_modes *modes,
-                                  u16 num_modes, enum hostapd_hw_mode mode)
+                                  u16 num_modes, enum hostapd_hw_mode mode,
+                                  int is_6ghz)
 {
        u16 i;
 
        for (i = 0; i < num_modes; i++) {
-               if (modes[i].mode == mode)
+               if (modes[i].mode != mode ||
+                   !modes[i].num_channels || !modes[i].channels)
+                       continue;
+               if ((!is_6ghz && !is_6ghz_freq(modes[i].channels[0].freq)) ||
+                   (is_6ghz && is_6ghz_freq(modes[i].channels[0].freq)))
                        return &modes[i];
        }
 

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 7ab6ca377779c483c0bad6bf0308dc5d50807130..ac4a1ba4e322ee07c5344cb487c1285e76ec6493 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -1560,7 +1560,8 @@ void fst_wpa_supplicant_fill_iface_obj(struct wpa_supplicant *wpa_s,
 int wpas_sched_scan_plans_set(struct wpa_supplicant *wpa_s, const char *cmd);
 
 struct hostapd_hw_modes * get_mode(struct hostapd_hw_modes *modes,
-                                  u16 num_modes, enum hostapd_hw_mode mode);
+                                  u16 num_modes, enum hostapd_hw_mode mode,
+                                  int is_6ghz);
 
 void wpa_bss_tmp_disallow(struct wpa_supplicant *wpa_s, const u8 *bssid,
                          unsigned int sec, int rssi_threshold);