| --- a/hostapd/config_file.c |
| +++ b/hostapd/config_file.c |
| @@ -3474,6 +3474,10 @@ static int hostapd_config_fill(struct ho |
| if (bss->ocv && !bss->ieee80211w) |
| bss->ieee80211w = 1; |
| #endif /* CONFIG_OCV */ |
| + } 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 |
| @@ -1014,6 +1014,8 @@ struct hostapd_config { |
| |
| int ht_op_mode_fixed; |
| u16 ht_capab; |
| + int noscan; |
| + int no_ht_coex; |
| int ieee80211n; |
| int secondary_channel; |
| int no_pri_sec_switch; |
| --- a/src/ap/hw_features.c |
| +++ b/src/ap/hw_features.c |
| @@ -517,7 +517,8 @@ static int ieee80211n_check_40mhz(struct |
| int ret; |
| |
| /* Check that HT40 is used and PRI / SEC switch is allowed */ |
| - if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch) |
| + if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch || |
| + iface->conf->noscan) |
| return 0; |
| |
| hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); |
| --- a/src/ap/ieee802_11_ht.c |
| +++ b/src/ap/ieee802_11_ht.c |
| @@ -230,6 +230,9 @@ void hostapd_2040_coex_action(struct hos |
| return; |
| } |
| |
| + if (iface->conf->noscan || iface->conf->no_ht_coex) |
| + return; |
| + |
| if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) { |
| wpa_printf(MSG_DEBUG, |
| "Ignore too short 20/40 BSS Coexistence Management frame"); |
| @@ -390,6 +393,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)); |
| |