2024-02-13 21:26:31 +00:00
|
|
|
From c61daab867671af884a7bb707f9bc0f086241bcd Mon Sep 17 00:00:00 2001
|
|
|
|
From: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
Date: Wed, 20 Jan 2010 02:26:00 +0000
|
|
|
|
Subject: [PATCH] Add noscan, no_ht_coex config options
|
|
|
|
|
2012-09-13 12:38:51 +00:00
|
|
|
--- a/hostapd/config_file.c
|
|
|
|
+++ b/hostapd/config_file.c
|
2024-08-15 18:47:25 +00:00
|
|
|
@@ -3680,6 +3680,10 @@ static int hostapd_config_fill(struct ho
|
2020-05-03 13:20:52 +00:00
|
|
|
if (bss->ocv && !bss->ieee80211w)
|
2019-05-03 23:52:25 +00:00
|
|
|
bss->ieee80211w = 1;
|
|
|
|
#endif /* CONFIG_OCV */
|
2014-04-06 12:13:55 +00:00
|
|
|
+ } else if (os_strcmp(buf, "noscan") == 0) {
|
|
|
|
+ conf->noscan = atoi(pos);
|
2015-06-02 08:39:19 +00:00
|
|
|
+ } else if (os_strcmp(buf, "ht_coex") == 0) {
|
|
|
|
+ conf->no_ht_coex = !atoi(pos);
|
2014-04-06 12:13:55 +00:00
|
|
|
} else if (os_strcmp(buf, "ieee80211n") == 0) {
|
|
|
|
conf->ieee80211n = atoi(pos);
|
|
|
|
} else if (os_strcmp(buf, "ht_capab") == 0) {
|
2012-09-13 12:38:51 +00:00
|
|
|
--- a/src/ap/ap_config.h
|
|
|
|
+++ b/src/ap/ap_config.h
|
2024-08-15 18:47:25 +00:00
|
|
|
@@ -1108,6 +1108,8 @@ struct hostapd_config {
|
2012-09-13 12:38:51 +00:00
|
|
|
|
|
|
|
int ht_op_mode_fixed;
|
|
|
|
u16 ht_capab;
|
|
|
|
+ int noscan;
|
2015-06-02 08:39:19 +00:00
|
|
|
+ int no_ht_coex;
|
2012-09-13 12:38:51 +00:00
|
|
|
int ieee80211n;
|
|
|
|
int secondary_channel;
|
2016-01-28 17:19:13 +00:00
|
|
|
int no_pri_sec_switch;
|
2012-09-13 12:38:51 +00:00
|
|
|
--- a/src/ap/hw_features.c
|
|
|
|
+++ b/src/ap/hw_features.c
|
2024-08-15 18:47:25 +00:00
|
|
|
@@ -551,7 +551,8 @@ static int ieee80211n_check_40mhz(struct
|
2014-06-05 15:58:01 +00:00
|
|
|
int ret;
|
2012-09-13 12:38:51 +00:00
|
|
|
|
2016-01-28 17:19:13 +00:00
|
|
|
/* 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;
|
2012-09-13 12:38:51 +00:00
|
|
|
|
2013-11-25 15:43:15 +00:00
|
|
|
hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
|
2014-07-25 14:29:58 +00:00
|
|
|
--- a/src/ap/ieee802_11_ht.c
|
|
|
|
+++ b/src/ap/ieee802_11_ht.c
|
2023-07-14 08:01:30 +00:00
|
|
|
@@ -239,6 +239,9 @@ void hostapd_2040_coex_action(struct hos
|
2014-07-25 14:29:58 +00:00
|
|
|
return;
|
2018-03-27 17:24:27 +00:00
|
|
|
}
|
2014-07-25 14:29:58 +00:00
|
|
|
|
2015-06-02 08:39:19 +00:00
|
|
|
+ if (iface->conf->noscan || iface->conf->no_ht_coex)
|
2014-07-25 14:29:58 +00:00
|
|
|
+ return;
|
|
|
|
+
|
2018-03-27 17:24:27 +00:00
|
|
|
if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"Ignore too short 20/40 BSS Coexistence Management frame");
|
2023-07-14 08:01:30 +00:00
|
|
|
@@ -399,6 +402,9 @@ void ht40_intolerant_add(struct hostapd_
|
2014-07-25 14:29:58 +00:00
|
|
|
if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
|
|
|
|
return;
|
|
|
|
|
2015-06-02 08:39:19 +00:00
|
|
|
+ if (iface->conf->noscan || iface->conf->no_ht_coex)
|
2014-07-25 14:29:58 +00:00
|
|
|
+ return;
|
|
|
|
+
|
|
|
|
wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
|
|
|
|
" in Association Request", MAC2STR(sta->addr));
|
|
|
|
|