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 <alexander.bondar@intel.com>
This commit is contained in:
Alexander Bondar 2015-11-03 16:25:00 +02:00 committed by Jouni Malinen
parent 757785dab2
commit 6bdc43c4db

View File

@ -472,8 +472,9 @@ static int ieee80211n_check_40mhz(struct hostapd_iface *iface)
struct wpa_driver_scan_params params; struct wpa_driver_scan_params params;
int ret; int ret;
if (!iface->conf->secondary_channel) /* Check that HT40 is used and PRI / SEC switch is allowed */
return 0; /* HT40 not used */ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
return 0;
hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
wpa_printf(MSG_DEBUG, "Scan for neighboring BSSes prior to enabling " wpa_printf(MSG_DEBUG, "Scan for neighboring BSSes prior to enabling "