blob: 1ea89043e89605b2867401732fc111c19b15760c [file] [log] [blame]
developer29c4d2d2022-12-26 19:41:22 +08001--- a/hostapd/config_file.c
2+++ b/hostapd/config_file.c
developer8bff6472023-07-17 11:11:44 +08003@@ -3448,6 +3448,10 @@ static int hostapd_config_fill(struct ho
developer29c4d2d2022-12-26 19:41:22 +08004 if (bss->ocv && !bss->ieee80211w)
5 bss->ieee80211w = 1;
6 #endif /* CONFIG_OCV */
7+ } else if (os_strcmp(buf, "noscan") == 0) {
8+ conf->noscan = atoi(pos);
9+ } else if (os_strcmp(buf, "ht_coex") == 0) {
10+ conf->no_ht_coex = !atoi(pos);
11 } else if (os_strcmp(buf, "ieee80211n") == 0) {
12 conf->ieee80211n = atoi(pos);
13 } else if (os_strcmp(buf, "ht_capab") == 0) {
14--- a/src/ap/ap_config.h
15+++ b/src/ap/ap_config.h
developer8bff6472023-07-17 11:11:44 +080016@@ -1072,6 +1072,8 @@ struct hostapd_config {
developer29c4d2d2022-12-26 19:41:22 +080017
18 int ht_op_mode_fixed;
19 u16 ht_capab;
20+ int noscan;
21+ int no_ht_coex;
22 int ieee80211n;
23 int secondary_channel;
24 int no_pri_sec_switch;
25--- a/src/ap/hw_features.c
26+++ b/src/ap/hw_features.c
27@@ -517,7 +517,8 @@ static int ieee80211n_check_40mhz(struct
28 int ret;
29
30 /* Check that HT40 is used and PRI / SEC switch is allowed */
31- if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
32+ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch ||
33+ iface->conf->noscan)
34 return 0;
35
36 hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
37--- a/src/ap/ieee802_11_ht.c
38+++ b/src/ap/ieee802_11_ht.c
developer8bff6472023-07-17 11:11:44 +080039@@ -239,6 +239,9 @@ void hostapd_2040_coex_action(struct hos
developer29c4d2d2022-12-26 19:41:22 +080040 return;
41 }
42
43+ if (iface->conf->noscan || iface->conf->no_ht_coex)
44+ return;
45+
46 if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) {
47 wpa_printf(MSG_DEBUG,
48 "Ignore too short 20/40 BSS Coexistence Management frame");
developer8bff6472023-07-17 11:11:44 +080049@@ -399,6 +402,9 @@ void ht40_intolerant_add(struct hostapd_
developer29c4d2d2022-12-26 19:41:22 +080050 if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
51 return;
52
53+ if (iface->conf->noscan || iface->conf->no_ht_coex)
54+ return;
55+
56 wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
57 " in Association Request", MAC2STR(sta->addr));
58