From ecaacad14d46b12f2b43372d09cb7fb3fa6fd3e6 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 6 Jun 2015 23:09:43 +0000 Subject: [PATCH] hostapd: move ht_coex variable to mac80211.sh, guarded by 802.11n support Signed-off-by: Felix Fietkau SVN-Revision: 45917 --- .../kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 7 +++++-- package/network/services/hostapd/files/netifd.sh | 6 ++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 4f680a41f5..c9bc3d610d 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -21,7 +21,7 @@ drv_mac80211_init_device_config() { config_add_string hwmode config_add_int beacon_int chanbw frag rts config_add_int rxantenna txantenna antenna_gain txpower distance - config_add_boolean noscan + config_add_boolean noscan ht_coex config_add_array ht_capab config_add_boolean \ rxldpc \ @@ -90,7 +90,7 @@ mac80211_hostapd_setup_base() { [ "$auto_channel" -gt 0 ] && channel=acs_survey - json_get_vars noscan + json_get_vars noscan ht_coex json_get_values ht_capab_list ht_capab ieee80211n=1 @@ -127,6 +127,9 @@ mac80211_hostapd_setup_base() { [ -n "$ieee80211n" ] && { append base_cfg "ieee80211n=1" "$N" + set_default ht_coex 0 + append base_cfg "ht_coex=$ht_coex" "$N" + json_get_vars \ ldpc:1 \ greenfield:0 \ diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh index 3647b2907f..23d2e7e83e 100644 --- a/package/network/services/hostapd/files/netifd.sh +++ b/package/network/services/hostapd/files/netifd.sh @@ -52,7 +52,7 @@ hostapd_common_add_device_config() { config_add_array supported_rates config_add_string country - config_add_boolean country_ie doth ht_coex + config_add_boolean country_ie doth config_add_string require_mode hostapd_add_log_config @@ -65,15 +65,13 @@ hostapd_prepare_device_config() { local base="${config%%.conf}" local base_cfg= - json_get_vars country country_ie beacon_int doth require_mode ht_coex + json_get_vars country country_ie beacon_int doth require_mode hostapd_set_log_options base_cfg set_default country_ie 1 set_default doth 1 - set_default ht_coex 0 - append base_cfg "ht_coex=$ht_coex" "$N" [ -n "$country" ] && { append base_cfg "country_code=$country" "$N" -- 2.25.1