mac80211/hostapd: short_preamble is a per-vif option and should be enabled by default
SVN-Revision: 35565
This commit is contained in:
parent
2e7a4b088d
commit
1810b80ec0
@ -14,7 +14,6 @@ mac80211_hostapd_setup_base() {
|
|||||||
config_get beacon_int "$device" beacon_int
|
config_get beacon_int "$device" beacon_int
|
||||||
config_get basic_rate_list "$device" basic_rate
|
config_get basic_rate_list "$device" basic_rate
|
||||||
config_get_bool noscan "$device" noscan
|
config_get_bool noscan "$device" noscan
|
||||||
config_get_bool short_preamble "$device" short_preamble "0"
|
|
||||||
|
|
||||||
hostapd_set_log_options base_cfg "$device"
|
hostapd_set_log_options base_cfg "$device"
|
||||||
|
|
||||||
@ -58,8 +57,6 @@ mac80211_hostapd_setup_base() {
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
append base_cfg "preamble=$short_preamble" "$N"
|
|
||||||
|
|
||||||
cat >> "$cfgfile" <<EOF
|
cat >> "$cfgfile" <<EOF
|
||||||
ctrl_interface=/var/run/hostapd-$phy
|
ctrl_interface=/var/run/hostapd-$phy
|
||||||
driver=nl80211
|
driver=nl80211
|
||||||
|
@ -12,6 +12,7 @@ hostapd_set_bss_options() {
|
|||||||
config_get_bool disassoc_low_ack "$vif" disassoc_low_ack 1
|
config_get_bool disassoc_low_ack "$vif" disassoc_low_ack 1
|
||||||
config_get max_num_sta "$vif" max_num_sta 0
|
config_get max_num_sta "$vif" max_num_sta 0
|
||||||
config_get max_inactivity "$vif" max_inactivity 0
|
config_get max_inactivity "$vif" max_inactivity 0
|
||||||
|
config_get_bool preamble "$vif" short_preamble 1
|
||||||
|
|
||||||
config_get device "$vif" device
|
config_get device "$vif" device
|
||||||
config_get hwmode "$device" hwmode
|
config_get hwmode "$device" hwmode
|
||||||
@ -29,6 +30,9 @@ hostapd_set_bss_options() {
|
|||||||
append "$var" "ap_max_inactivity=$max_inactivity" "$N"
|
append "$var" "ap_max_inactivity=$max_inactivity" "$N"
|
||||||
fi
|
fi
|
||||||
append "$var" "disassoc_low_ack=$disassoc_low_ack" "$N"
|
append "$var" "disassoc_low_ack=$disassoc_low_ack" "$N"
|
||||||
|
if [ "$preamble" -gt 0 ]; then
|
||||||
|
append "$var" "preamble=$preamble" "$N"
|
||||||
|
fi
|
||||||
|
|
||||||
# Examples:
|
# Examples:
|
||||||
# psk-mixed/tkip => WPA1+2 PSK, TKIP
|
# psk-mixed/tkip => WPA1+2 PSK, TKIP
|
||||||
|
Loading…
Reference in New Issue
Block a user