nl80211: Explicitly differentiate between 5 GHz and 6 GHz modes

When a device supports both the 5 GHz band and the 6 GHz band,
these are reported as two separate modes, both with mode set to
HOSTAPD_MODE_IEEE80211A. However, as these are different modes,
each with its own characteristics, e.g., rates, capabilities etc.,
specifically differentiate between them by adding a flag to indicate
whether the mode describes a 6 GHz band capabilities or not.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>

diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
index 596f2f020a72088efca3ab689ba75cfd9b29be90..fd401d78af826e233c259518c8351df43f53ea87 100644 (file)
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
@@ -107,9 +107,7 @@ int hostapd_get_hw_features(struct hostapd_iface *iface)
                 */
                orig_mode_valid = true;
                mode = iface->current_mode->mode;
-               is_6ghz = mode == HOSTAPD_MODE_IEEE80211A &&
-                       iface->current_mode->num_channels > 0 &&
-                       is_6ghz_freq(iface->current_mode->channels[0].freq);
+               is_6ghz = iface->current_mode->is_6ghz;
                iface->current_mode = NULL;
        }
        hostapd_free_hw_features(iface->hw_features, iface->num_hw_features);
@@ -1070,9 +1068,7 @@ static bool skip_mode(struct hostapd_iface *iface,
                return true;
 
        if (is_6ghz_op_class(iface->conf->op_class) && iface->freq == 0 &&
-           (mode->mode != HOSTAPD_MODE_IEEE80211A ||
-            mode->num_channels == 0 ||
-            !is_6ghz_freq(mode->channels[0].freq)))
+           !mode->is_6ghz)
                return true;
 
        return false;

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index ed76037d2507cb72b5eb8a9489178b326984694b..bbaf8eafa95200a664ef098ceb6fa9e6bb6902b1 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -246,6 +246,11 @@ struct hostapd_hw_modes {
         */
        enum hostapd_hw_mode mode;
 
+       /**
+        * is_6ghz - Whether the mode information is for the 6 GHz band
+        */
+       bool is_6ghz;
+
        /**
         * num_channels - Number of entries in the channels array
         */

diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
index 59f1414acf6f6765011e37bcf7247365b5253742..cef23b1836883d3d72ca1049d6a47cfb06324740 100644 (file)
--- a/src/drivers/driver_nl80211_capa.c
+++ b/src/drivers/driver_nl80211_capa.c
@@ -2156,6 +2156,9 @@ wpa_driver_nl80211_postprocess_modes(struct hostapd_hw_modes *modes,
        for (m = 0; m < *num_modes; m++) {
                if (!modes[m].num_channels)
                        continue;
+
+               modes[m].is_6ghz = false;
+
                if (modes[m].channels[0].freq < 2000) {
                        modes[m].num_channels = 0;
                        continue;
@@ -2167,10 +2170,14 @@ wpa_driver_nl80211_postprocess_modes(struct hostapd_hw_modes *modes,
                                        break;
                                }
                        }
-               } else if (modes[m].channels[0].freq > 50000)
+               } else if (modes[m].channels[0].freq > 50000) {
                        modes[m].mode = HOSTAPD_MODE_IEEE80211AD;
-               else
+               } else if (is_6ghz_freq(modes[m].channels[0].freq)) {
                        modes[m].mode = HOSTAPD_MODE_IEEE80211A;
+                       modes[m].is_6ghz = true;
+               } else {
+                       modes[m].mode = HOSTAPD_MODE_IEEE80211A;
+               }
        }
 
        /* Remove unsupported bands */

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 91a213dacb387808874be53a620c52843c54174c..cd37a20ebe62fcc5cc68b091ad83e31b8dfbb164 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -9055,8 +9055,7 @@ struct hostapd_hw_modes * get_mode(struct hostapd_hw_modes *modes,
                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)))
+               if (is_6ghz == modes[i].is_6ghz)
                        return &modes[i];
        }