From f54ce743353f14a5007c7e908b6374ef703b77e3 Mon Sep 17 00:00:00 2001 From: Xinyue Ling Date: Fri, 14 Apr 2023 00:58:03 -0700 Subject: [PATCH] Fix determining mode for 6 GHz band when using hw_mode=any When 6 GHz band is specified and hw_mode parameter is set to any, hostapd_determine_mode() may determine the wrong mode because there are two hw modes (5 GHz and 6 GHz) with HOSTAPD_MODE_IEEE80211A. This will cause 6 GHz AP to fail to start. Fix this by adding a check similar to the changes in commit 99cd453720d6 ("hw_feature: Correctly select mode in case of the 6 GHz band") into hostapd_determine_mode(). Signed-off-by: Jouni Malinen --- src/ap/hw_features.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c index 842d9f5ba..154449068 100644 --- a/src/ap/hw_features.c +++ b/src/ap/hw_features.c @@ -1003,7 +1003,7 @@ static int hostapd_is_usable_chans(struct hostapd_iface *iface) static void hostapd_determine_mode(struct hostapd_iface *iface) { - int i; + int i, chan; enum hostapd_hw_mode target_mode; if (iface->current_mode || @@ -1022,6 +1022,10 @@ static void hostapd_determine_mode(struct hostapd_iface *iface) mode = &iface->hw_features[i]; if (mode->mode == target_mode) { + if (iface->freq > 0 && + !hw_mode_get_channel(mode, iface->freq, &chan)) + continue; + iface->current_mode = mode; iface->conf->hw_mode = mode->mode; break; -- 2.47.3