From: Steven Barth <steven@midlink.org>
Date: Wed, 12 Nov 2008 21:33:23 +0000 (+0000)
Subject: Added nosbeacon flags to wifi configuration
X-Git-Tag: 0.9.0~979
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=5ae95430e173381c4f2bab38c5059deedc27dcc4

Added nosbeacon flags to wifi configuration
---

diff --git a/i18n/english/luasrc/i18n/wifi.en.lua b/i18n/english/luasrc/i18n/wifi.en.lua
index 2a0ef02e9..e5680d1d8 100644
--- a/i18n/english/luasrc/i18n/wifi.en.lua
+++ b/i18n/english/luasrc/i18n/wifi.en.lua
@@ -32,4 +32,5 @@ wifi_ff = 'Fast Frames'
 wifi_wmm = 'WMM Mode'
 wifi_xr = 'XR Support'
 wifi_ar = 'AR Support'
+wifi_nosbeacon = 'Disable HW-Beacon timer'
 wifi_wpareq = 'WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.'
diff --git a/i18n/english/luasrc/i18n/wifi.en.xml b/i18n/english/luasrc/i18n/wifi.en.xml
index 3e3f18a2b..4a64b5d4f 100644
--- a/i18n/english/luasrc/i18n/wifi.en.xml
+++ b/i18n/english/luasrc/i18n/wifi.en.xml
@@ -36,6 +36,7 @@
 <i18n:msg xml:id="wifi_wmm">WMM Mode</i18n:msg>
 <i18n:msg xml:id="wifi_xr">XR Support</i18n:msg>
 <i18n:msg xml:id="wifi_ar">AR Support</i18n:msg>
+<i18n:msg xml:id="wifi_nosbeacon">Disable HW-Beacon timer</i18n:msg>
 
 <i18n:msg xml:id="wifi_wpareq">WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.</i18n:msg>
 
diff --git a/i18n/german/luasrc/i18n/wifi.de.lua b/i18n/german/luasrc/i18n/wifi.de.lua
index e16ec1e09..6bb5228f5 100644
--- a/i18n/german/luasrc/i18n/wifi.de.lua
+++ b/i18n/german/luasrc/i18n/wifi.de.lua
@@ -32,4 +32,5 @@ wifi_ff = 'Schnelle Frames'
 wifi_wmm = 'WMM Modus'
 wifi_xr = 'XR-Unterstützung'
 wifi_ar = 'AR-Unterstützung'
+wifi_nosbeacon = 'Deaktiviere Hardware-Beacon Zeitgeber'
 wifi_wpareq = 'Für WPA-Verschlüsselung muss wpa_supplicant (für Clientmodus) oder hostapd (für AP und Ad-hoc-Modus) installiert sein.'
diff --git a/i18n/german/luasrc/i18n/wifi.de.xml b/i18n/german/luasrc/i18n/wifi.de.xml
index 5b35f6554..a05adf4e5 100644
--- a/i18n/german/luasrc/i18n/wifi.de.xml
+++ b/i18n/german/luasrc/i18n/wifi.de.xml
@@ -36,6 +36,7 @@
 <i18n:msg xml:id="wifi_wmm">WMM Modus</i18n:msg>
 <i18n:msg xml:id="wifi_xr">XR-Unterstützung</i18n:msg>
 <i18n:msg xml:id="wifi_ar">AR-Unterstützung</i18n:msg>
+<i18n:msg xml:id="wifi_nosbeacon">Deaktiviere Hardware-Beacon Zeitgeber</i18n:msg>
 
 <i18n:msg xml:id="wifi_wpareq">Für WPA-Verschlüsselung muss wpa_supplicant (für Clientmodus) oder hostapd (für AP und Ad-hoc-Modus) installiert sein.</i18n:msg>
 
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index fa3ad753b..8ff6b3a13 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -225,6 +225,14 @@ if hwtype == "atheros" then
 	s:option(Flag, "wmm", translate("wifi_wmm")).optional = true
 	s:option(Flag, "xr", translate("wifi_xr")).optional = true
 	s:option(Flag, "ar", translate("wifi_ar")).optional = true
+
+	local swm = s:option(Flag, "sw_merge", translate("wifi_nosbeacon"))
+	swm:depends({mode="adhoc"})
+	swm.optional = true
+
+	local nos = s:option(Flag, "nosbeacon", translate("wifi_nosbeacon"))
+	nos:depends({mode="sta"})
+	nos.optional = true
 end