[PATCH] Add regdomain, country and outdoor options for madwifi

Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>

diff --git a/i18n/english/luasrc/i18n/wifi.en.lua b/i18n/english/luasrc/i18n/wifi.en.lua
index 47859b3..1c4bc60 100644 (file)
--- a/i18n/english/luasrc/i18n/wifi.en.lua
+++ b/i18n/english/luasrc/i18n/wifi.en.lua
@@ -10,7 +10,9 @@ wifi_whitelist = 'Allow listed only'
 wifi_blacklist = 'Allow all except listed'
 wifi_maclist = 'MAC-List'
 wifi_bursting = 'Frame Bursting'
+wifi_regdomain = 'Regulatory Domain'
 wifi_country = 'Country Code'
+wifi_outdoor = 'Outdoor Channels'
 wifi_maxassoc = 'Connection Limit'
 wifi_essid = '<abbr title="Extended Service Set Identifier">ESSID</abbr>'
 wifi_bssid = '<abbr title="Basic Service Set Identifier">BSSID</abbr>'

diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless
index 7e72049..bd466d1 100644 (file)
--- a/modules/admin-core/root/lib/uci/schema/default/wireless
+++ b/modules/admin-core/root/lib/uci/schema/default/wireless
@@ -146,10 +146,24 @@ config variable
        list depends 'type=broadcom'
 
 config variable
+       option name 'regdomain'
+       option section 'wireless.wifi-device'
+       option title 'Regulatory Domain'
+       list depends 'type=atheros'
+
+config variable
        option name 'country'
        option section 'wireless.wifi-device'
-       option title 'Country Code (broadcom)'
+       option title 'Country Code'
        list depends 'type=broadcom'
+       list depends 'type=atheros'
+
+config variable
+       option name 'outdoor'
+       option section 'wireless.wifi-device'
+       option title 'Outdoor Channels'
+       option datatype boolean
+       list depends 'type=atheros'
 
 config variable
        option name 'maxassoc'

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 72c79b6..6783866 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -89,6 +89,9 @@ if hwtype == "atheros" then
        end
        s:option(Value, "distance", translate("wifi_distance"),
                translate("wifi_distance_desc")).optional = true
+       s:option(Value, "regdomain", translate("wifi_regdomain")).optional = true
+       s:option(Value, "country", translate("wifi_country")).optional = true
+       s:option(Flag, "outdoor", translate("wifi_outdoor")).optional = true
 
        --s:option(Flag, "nosbeacon", translate("wifi_nosbeacon")).optional = true
 end