--- a/hostapd/config_file.c +++ b/hostapd/config_file.c @@ -2771,6 +2771,10 @@ static int hostapd_config_fill(struct ho } #endif /* CONFIG_IEEE80211W */ #ifdef CONFIG_IEEE80211N + } else if (os_strcmp(buf, "noscan") == 0) { + conf->noscan = atoi(pos); + } else if (os_strcmp(buf, "ht_coex") == 0) { + conf->no_ht_coex = !atoi(pos); } else if (os_strcmp(buf, "ieee80211n") == 0) { conf->ieee80211n = atoi(pos); } else if (os_strcmp(buf, "ht_capab") == 0) { --- a/src/ap/ap_config.h +++ b/src/ap/ap_config.h @@ -619,6 +619,8 @@ struct hostapd_config { int ht_op_mode_fixed; u16 ht_capab; + int noscan; + int no_ht_coex; int ieee80211n; int secondary_channel; int require_ht; --- a/src/ap/hw_features.c +++ b/src/ap/hw_features.c @@ -461,7 +461,7 @@ static int ieee80211n_check_40mhz(struct struct wpa_driver_scan_params params; int ret; - if (!iface->conf->secondary_channel) + if (!iface->conf->secondary_channel || iface->conf->noscan) return 0; /* HT40 not used */ hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); --- a/src/ap/ieee802_11_ht.c +++ b/src/ap/ieee802_11_ht.c @@ -221,6 +221,9 @@ void hostapd_2040_coex_action(struct hos if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)) return; + if (iface->conf->noscan || iface->conf->no_ht_coex) + return; + if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) return; @@ -346,6 +349,9 @@ void ht40_intolerant_add(struct hostapd_ if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G) return; + if (iface->conf->noscan || iface->conf->no_ht_coex) + return; + wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR " in Association Request", MAC2STR(sta->addr));