DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Add noscan, no_ht_coex config options

Browse source
This commit is contained in:
Felix Fietkau 2010-01-20 02:26:00 +00:00 • committed by sinavir
parent fbd403ac84
commit 498f318216
No known key found for this signature in database
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hostapd/config_file.c
View file

@ -3747,6 +3747,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
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) {

2
src/ap/ap_config.h
View file

@ -1122,6 +1122,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;

3
src/ap/hw_features.c
View file

@ -573,7 +573,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);

6
src/ap/ieee802_11_ht.c
View file

@ -279,6 +279,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");
@ -439,6 +442,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));