Rename wireless.wifi-device.mode to wireless.wifi-device.hwmode

diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless
index 5ec26bc..d3256bc 100644 (file)
--- a/modules/admin-core/root/lib/uci/schema/default/wireless
+++ b/modules/admin-core/root/lib/uci/schema/default/wireless
@@ -27,49 +27,49 @@ config variable
        option title 'Channel'
 
 config variable
        option title 'Channel'
 
 config variable

-       option name 'mode'
+       option name 'hwmode'

        option section 'wireless.wifi-device'
        option title 'Mode (atheros)'
        option type enum
        list depends type=atheros
 
 config enum
        option section 'wireless.wifi-device'
        option title 'Mode (atheros)'
        option type enum
        list depends type=atheros
 
 config enum

-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'

        option value ''
        option title 'auto'
 
 config enum
        option value ''
        option title 'auto'
 
 config enum

-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'

        option value '11b'
        option title '802.11b'
 
 config enum
        option value '11b'
        option title '802.11b'
 
 config enum

-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'

        option value '11g'
        option title '802.11g'
 
 config enum
        option value '11g'
        option title '802.11g'
 
 config enum

-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'

        option value '11a'
        option title '802.11a'
 
 config enum
        option value '11a'
        option title '802.11a'
 
 config enum

-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'

        option value '11bg'
        option title '802.11b+g'
 
 config enum
        option value '11bg'
        option title '802.11b+g'
 
 config enum

-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'

        option value '11gdt'
        option title '802.11adt'
 
 config enum
        option value '11gdt'
        option title '802.11adt'
 
 config enum

-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'

        option value '11adt'
        option title '802.11adt'
 
 config enum
        option value '11adt'
        option title '802.11adt'
 
 config enum

-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'

        option value 'fh'
        option title 'Frequency Hopping'
 
        option value 'fh'
        option title 'Frequency Hopping'
 

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 6d46a54..b64190b 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -62,7 +62,7 @@ end
 ------------------- Madwifi Device ------------------
 
 if hwtype == "atheros" then
 ------------------- Madwifi Device ------------------
 
 if hwtype == "atheros" then

-       mode = s:option(ListValue, "mode", translate("mode"))
+       mode = s:option(ListValue, "hwmode", translate("mode"))

        mode:value("", translate("wifi_auto"))
        mode:value("11b", "802.11b")
        mode:value("11g", "802.11g")
        mode:value("", translate("wifi_auto"))
        mode:value("11b", "802.11b")
        mode:value("11g", "802.11g")

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index e7a1645..8b62309 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -142,7 +142,7 @@ end
 local hwtype = m:get(wifidevs[1], "type")
 
 if hwtype == "atheros" then
 local hwtype = m:get(wifidevs[1], "type")
 
 if hwtype == "atheros" then

-       mode = s:option(ListValue, "mode", translate("mode"))
+       mode = s:option(ListValue, "hwmode", translate("mode"))

        mode.override_values = true
        mode:value("", "auto")
        mode:value("11b", "802.11b")
        mode.override_values = true
        mode:value("", "auto")
        mode:value("11b", "802.11b")