From: Steven Barth <steven@midlink.org>
Date: Fri, 16 Jan 2009 19:14:15 +0000 (+0000)
Subject: Merge r4047
X-Git-Tag: 0.8.4~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fa9f794755a9b3d78f0ce5f27398d474355f23f7;p=oweals%2Fluci.git

Merge r4047
---

diff --git a/i18n/english/luasrc/i18n/wifi.en.lua b/i18n/english/luasrc/i18n/wifi.en.lua
index 438ef1c66..47859b3db 100644
--- 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 d3256bceb..c86733afa 100644
--- 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'