Handle both HT40+ and HT40- allowed consistently in channel check

Return the result from the first hostapd_is_usable_chan() call instead
of the following attempts in case of ht40_plus_minus_allowed to have
consistent behavior with the case where only one option is specified.
This allows the fallback to 20 MHz to work in additional cases.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
index 9edbb5ae214d00d92b903cbd2404f8654fe91033..596f2f020a72088efca3ab689ba75cfd9b29be90 100644 (file)
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
@@ -1001,7 +1001,7 @@ static int hostapd_is_usable_chans(struct hostapd_iface *iface)
 {
        int secondary_freq;
        struct hostapd_channel_data *pri_chan;
-       int err;
+       int err, err2;
 
        if (!iface->current_mode)
                return 0;
@@ -1044,15 +1044,15 @@ static int hostapd_is_usable_chans(struct hostapd_iface *iface)
 
        /* Both HT40+ and HT40- are set, pick a valid secondary channel */
        secondary_freq = iface->freq + 20;
-       err = hostapd_is_usable_chan(iface, secondary_freq, 0);
-       if (err > 0 && (pri_chan->allowed_bw & HOSTAPD_CHAN_WIDTH_40P)) {
+       err2 = hostapd_is_usable_chan(iface, secondary_freq, 0);
+       if (err2 > 0 && (pri_chan->allowed_bw & HOSTAPD_CHAN_WIDTH_40P)) {
                iface->conf->secondary_channel = 1;
                return 1;
        }
 
        secondary_freq = iface->freq - 20;
-       err = hostapd_is_usable_chan(iface, secondary_freq, 0);
-       if (err > 0 && (pri_chan->allowed_bw & HOSTAPD_CHAN_WIDTH_40M)) {
+       err2 = hostapd_is_usable_chan(iface, secondary_freq, 0);
+       if (err2 > 0 && (pri_chan->allowed_bw & HOSTAPD_CHAN_WIDTH_40M)) {
                iface->conf->secondary_channel = -1;
                return 1;
        }