From 6bdc43c4db724ee82aa4ecf6d0b7ea853cd6007a Mon Sep 17 00:00:00 2001 From: Alexander Bondar Date: Tue, 3 Nov 2015 16:25:00 +0200 Subject: [PATCH] AP: Avoid 20/40 MHz co-ex scan if PRI/SEC switch is not allowed When an AP is started on the 5.2 GHz band with 40 MHz bandwidth, a scan is issued in order to handle 20/40 MHz coexistence. However, the scan is issued even if iface->conf->no_pri_sec_switch is set, which is redundant. Fix this by checking iface->conf->no_pri_sec_switch before starting the scan. Signed-off-by: Alexander Bondar --- src/ap/hw_features.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c index fc8786dc3..360706684 100644 --- a/src/ap/hw_features.c +++ b/src/ap/hw_features.c @@ -472,8 +472,9 @@ static int ieee80211n_check_40mhz(struct hostapd_iface *iface) struct wpa_driver_scan_params params; int ret; - if (!iface->conf->secondary_channel) - return 0; /* HT40 not used */ + /* Check that HT40 is used and PRI / SEC switch is allowed */ + if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch) + return 0; hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); wpa_printf(MSG_DEBUG, "Scan for neighboring BSSes prior to enabling "