63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
|
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
|
||
|
|
index 82ac61d..3570d96 100644
|
||
|
|
--- a/hostapd/config_file.c
|
||
|
|
+++ b/hostapd/config_file.c
|
||
|
|
@@ -2795,6 +2795,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
|
||
|
|
}
|
||
|
|
#endif /* CONFIG_IEEE80211W */
|
||
|
|
#ifdef CONFIG_IEEE80211N
|
||
|
|
+ } else if (os_strcmp(buf, "noscan") == 0) {
|
||
|
|
+ conf->noscan = atoi(pos);
|
||
|
|
} else if (os_strcmp(buf, "ieee80211n") == 0) {
|
||
|
|
conf->ieee80211n = atoi(pos);
|
||
|
|
} else if (os_strcmp(buf, "ht_capab") == 0) {
|
||
|
|
diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
|
||
|
|
index de470a9..f2a0235 100644
|
||
|
|
--- a/src/ap/ap_config.h
|
||
|
|
+++ b/src/ap/ap_config.h
|
||
|
|
@@ -626,6 +626,7 @@ struct hostapd_config {
|
||
|
|
|
||
|
|
int ht_op_mode_fixed;
|
||
|
|
u16 ht_capab;
|
||
|
|
+ int noscan;
|
||
|
|
int ieee80211n;
|
||
|
|
int secondary_channel;
|
||
|
|
int no_pri_sec_switch;
|
||
|
|
diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
|
||
|
|
index fc8786d..0d5b384 100644
|
||
|
|
--- a/src/ap/hw_features.c
|
||
|
|
+++ b/src/ap/hw_features.c
|
||
|
|
@@ -472,7 +472,7 @@ static int ieee80211n_check_40mhz(struct hostapd_iface *iface)
|
||
|
|
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);
|
||
|
|
diff --git a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c
|
||
|
|
index 11fde2a..87fb67b 100644
|
||
|
|
--- a/src/ap/ieee802_11_ht.c
|
||
|
|
+++ b/src/ap/ieee802_11_ht.c
|
||
|
|
@@ -221,6 +221,9 @@ void hostapd_2040_coex_action(struct hostapd_data *hapd,
|
||
|
|
if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
|
||
|
|
return;
|
||
|
|
|
||
|
|
+ if (iface->conf->noscan)
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie))
|
||
|
|
return;
|
||
|
|
|
||
|
|
@@ -345,6 +348,9 @@ void ht40_intolerant_add(struct hostapd_iface *iface, struct sta_info *sta)
|
||
|
|
if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
|
||
|
|
return;
|
||
|
|
|
||
|
|
+ if (iface->conf->noscan)
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
|
||
|
|
" in Association Request", MAC2STR(sta->addr));
|
||
|
|
|