diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-02-11 18:59:10 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-02-11 18:59:10 +0000 |
| commit | bd93518c7bf055677fea8b489d1da76f9038f58b (patch) | |
| tree | c0f7d2ca77f2ff767638f70445aa3df097e49986 | |
| parent | 0b6484dce5ace7f5e0cc3f54fd9b18252affcf42 (diff) | |
mac80211/hostapd: short_preamble is a per-vif option and should be enabled by default
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35565 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mac80211/files/lib/wifi/mac80211.sh | 3 | ||||
| -rw-r--r-- | package/network/services/hostapd/files/hostapd.sh | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index a2399357c1..1ad3eb5086 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -14,7 +14,6 @@ mac80211_hostapd_setup_base() { config_get beacon_int "$device" beacon_int config_get basic_rate_list "$device" basic_rate config_get_bool noscan "$device" noscan - config_get_bool short_preamble "$device" short_preamble "0" hostapd_set_log_options base_cfg "$device" @@ -58,8 +57,6 @@ mac80211_hostapd_setup_base() { done } - append base_cfg "preamble=$short_preamble" "$N" - cat >> "$cfgfile" <<EOF ctrl_interface=/var/run/hostapd-$phy driver=nl80211 diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index ab4288b362..00c6a094cf 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -12,6 +12,7 @@ hostapd_set_bss_options() { config_get_bool disassoc_low_ack "$vif" disassoc_low_ack 1 config_get max_num_sta "$vif" max_num_sta 0 config_get max_inactivity "$vif" max_inactivity 0 + config_get_bool preamble "$vif" short_preamble 1 config_get device "$vif" device config_get hwmode "$device" hwmode @@ -29,6 +30,9 @@ hostapd_set_bss_options() { append "$var" "ap_max_inactivity=$max_inactivity" "$N" fi append "$var" "disassoc_low_ack=$disassoc_low_ack" "$N" + if [ "$preamble" -gt 0 ]; then + append "$var" "preamble=$preamble" "$N" + fi # Examples: # psk-mixed/tkip => WPA1+2 PSK, TKIP |