78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
From e8bf6ea2fbcbcff612b6adf93cb5fcdf86f0c4a0 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Walther <patrick.walther@netmodule.com>
|
|
Date: Tue, 28 Jan 2020 15:14:35 +0100
|
|
|
|
---
|
|
hostapd/config_file.c | 4 ++++
|
|
src/ap/ap_config.h | 2 ++
|
|
src/ap/hw_features.c | 3 ++-
|
|
src/ap/ieee802_11_ht.c | 6 ++++++
|
|
4 files changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
|
|
index e09e6e141..625104831 100644
|
|
--- a/hostapd/config_file.c
|
|
+++ b/hostapd/config_file.c
|
|
@@ -3411,6 +3411,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
|
|
bss->ieee80211w = 1;
|
|
#endif /* CONFIG_OCV */
|
|
#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) {
|
|
diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
|
|
index cfe59d4b4..826030666 100644
|
|
--- a/src/ap/ap_config.h
|
|
+++ b/src/ap/ap_config.h
|
|
@@ -934,6 +934,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;
|
|
diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
|
|
index c1f19e26b..993f0d035 100644
|
|
--- a/src/ap/hw_features.c
|
|
+++ b/src/ap/hw_features.c
|
|
@@ -477,7 +477,8 @@ static int ieee80211n_check_40mhz(struct hostapd_iface *iface)
|
|
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);
|
|
diff --git a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c
|
|
index 214855dcc..3697ca331 100644
|
|
--- a/src/ap/ieee802_11_ht.c
|
|
+++ b/src/ap/ieee802_11_ht.c
|
|
@@ -252,6 +252,9 @@ void hostapd_2040_coex_action(struct hostapd_data *hapd,
|
|
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");
|
|
@@ -412,6 +415,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 || 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));
|
|
|