ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-21 09:42:09 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

hostapd: add a new option to control HT coexistance separate from noscan

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45873
This commit is contained in:
Felix Fietkau 2015-06-02 08:39:19 +00:00
parent 5e5c821233
commit 91467cec6f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/network/services/hostapd/files/netifd.sh
View File

@ -52,7 +52,7 @@ hostapd_common_add_device_config() {
config_add_array supported_rates config_add_array supported_rates
config_add_string country config_add_string country
config_add_boolean country_ie doth config_add_boolean country_ie doth ht_coex
config_add_string require_mode config_add_string require_mode
hostapd_add_log_config hostapd_add_log_config
@ -65,13 +65,15 @@ hostapd_prepare_device_config() {
local base="${config%%.conf}" local base="${config%%.conf}"
local base_cfg= local base_cfg=
json_get_vars country country_ie beacon_int doth require_mode json_get_vars country country_ie beacon_int doth require_mode ht_coex
hostapd_set_log_options base_cfg hostapd_set_log_options base_cfg
set_default country_ie 1 set_default country_ie 1
set_default doth 1 set_default doth 1
set_default ht_coex 0
append base_cfg "ht_coex=$ht_coex" "$N"
[ -n "$country" ] && { [ -n "$country" ] && {
append base_cfg "country_code=$country" "$N" append base_cfg "country_code=$country" "$N"

11
package/network/services/hostapd/patches/300-noscan.patch
View File

@ -1,21 +1,24 @@
--- a/hostapd/config_file.c --- a/hostapd/config_file.c
+++ b/hostapd/config_file.c +++ b/hostapd/config_file.c
@@ -2771,6 +2771,8 @@ static int hostapd_config_fill(struct ho @@ -2771,6 +2771,10 @@ static int hostapd_config_fill(struct ho
} }
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_IEEE80211N #ifdef CONFIG_IEEE80211N
+ } else if (os_strcmp(buf, "noscan") == 0) { + } else if (os_strcmp(buf, "noscan") == 0) {
+ conf->noscan = atoi(pos); + 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) { } else if (os_strcmp(buf, "ieee80211n") == 0) {
conf->ieee80211n = atoi(pos); conf->ieee80211n = atoi(pos);
} else if (os_strcmp(buf, "ht_capab") == 0) { } else if (os_strcmp(buf, "ht_capab") == 0) {
--- a/src/ap/ap_config.h --- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h +++ b/src/ap/ap_config.h
@@ -619,6 +619,7 @@ struct hostapd_config { @@ -619,6 +619,8 @@ struct hostapd_config {
int ht_op_mode_fixed; int ht_op_mode_fixed;
u16 ht_capab; u16 ht_capab;
+ int noscan; + int noscan;
+ int no_ht_coex;
int ieee80211n; int ieee80211n;
int secondary_channel; int secondary_channel;
int require_ht; int require_ht;
@ -36,7 +39,7 @@
if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)) if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
return; return;
+ if (iface->conf->noscan) + if (iface->conf->noscan || iface->conf->no_ht_coex)
+ return; + return;
+ +
if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie))
@ -46,7 +49,7 @@
if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G) if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
return; return;
+ if (iface->conf->noscan) + if (iface->conf->noscan || iface->conf->no_ht_coex)
+ return; + return;
+ +
wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR