Merge r4047

diff --git a/i18n/english/luasrc/i18n/wifi.en.lua b/i18n/english/luasrc/i18n/wifi.en.lua
index 438ef1c66adc5e7da6c3f7d6f1c13fccbad6bbe0..47859b3dbe9d3e79daa05ed34fbe2c1a2643fa13 100644 (file)
--- a/i18n/english/luasrc/i18n/wifi.en.lua
+++ b/i18n/english/luasrc/i18n/wifi.en.lua
@@ -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.'

diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless
index d3256bcebb1c7f514db5b45b9bf3aa7782d89e44..c86733afacb71b186d9c7d9f8d53e47dc70e09d7 100644 (file)
--- a/modules/admin-core/root/lib/uci/schema/default/wireless
+++ b/modules/admin-core/root/lib/uci/schema/default/wireless
@@ -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'