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: move ht_coex variable to mac80211.sh, guarded by 802.11n support

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

SVN-Revision: 45917
This commit is contained in:
Felix Fietkau 2015-06-06 23:09:43 +00:00
parent 2364dd9331
commit ecaacad14d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
View File

@ -21,7 +21,7 @@ drv_mac80211_init_device_config() {
config_add_string hwmode config_add_string hwmode
config_add_int beacon_int chanbw frag rts config_add_int beacon_int chanbw frag rts
config_add_int rxantenna txantenna antenna_gain txpower distance 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_array ht_capab
config_add_boolean \ config_add_boolean \
rxldpc \ rxldpc \
@ -90,7 +90,7 @@ mac80211_hostapd_setup_base() {
[ "$auto_channel" -gt 0 ] && channel=acs_survey [ "$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 json_get_values ht_capab_list ht_capab
ieee80211n=1 ieee80211n=1
@ -127,6 +127,9 @@ mac80211_hostapd_setup_base() {
[ -n "$ieee80211n" ] && { [ -n "$ieee80211n" ] && {
append base_cfg "ieee80211n=1" "$N" append base_cfg "ieee80211n=1" "$N"
set_default ht_coex 0
append base_cfg "ht_coex=$ht_coex" "$N"
json_get_vars \ json_get_vars \
ldpc:1 \ ldpc:1 \
greenfield:0 \ greenfield:0 \

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 ht_coex config_add_boolean country_ie doth
config_add_string require_mode config_add_string require_mode
hostapd_add_log_config hostapd_add_log_config
@ -65,15 +65,13 @@ 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 ht_coex json_get_vars country country_ie beacon_int doth require_mode
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"