Merge r4047

This commit is contained in:
Steven Barth 2009-01-16 19:14:15 +00:00
parent 491f6af135
commit fa9f794755
2 changed files with 19 additions and 1 deletions

View file

@ -33,5 +33,5 @@ wifi_wmm = 'WMM Mode'
wifi_xr = 'XR Support'
wifi_ar = 'AR Support'
wifi_nosbeacon = 'Disable HW-Beacon timer'
wifi_noprobereq = 'Don not send probe responses'
wifi_noprobereq = 'Do not send probe responses'
wifi_wpareq = 'WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.'

View file

@ -280,6 +280,24 @@ config variable
option title 'Background Scan (atheros)'
option datatype boolean
config variable
option name 'sw_merge'
option section 'wireless.wifi-iface'
option title 'Disable Ad-Hoc HW beacon timer (atheros)'
option datatype boolean
config variable
option name 'nosbeacon'
option section 'wireless.wifi-iface'
option title 'Disable station HW beacon timer (atheros)'
option datatype boolean
config variable
option name 'probereq'
option section 'wireless.wifi-iface'
option title 'Disable probe responses (atheros)'
option datatype boolean
config variable
option name 'macpolicy'
option section 'wireless.wifi-iface'