diff options
| author | Steven Barth <steven@midlink.org> | 2009-11-15 21:49:52 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2009-11-15 21:49:52 +0000 |
| commit | efe5fc77f9c76ca75ae0e4c1735065589d5047c8 (patch) | |
| tree | 789cce1649126ef316ff11cf10ea62179dd55403 /modules/niu/luasrc/model | |
| parent | c27128946b4950af78a5fd35c12a1bf7531cc1f4 (diff) | |
NIU: Cleanup
Diffstat (limited to 'modules/niu/luasrc/model')
| -rw-r--r-- | modules/niu/luasrc/model/cbi/niu/wireless/ap.lua | 3 | ||||
| -rw-r--r-- | modules/niu/luasrc/model/cbi/niu/wireless/ap1.lua | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/modules/niu/luasrc/model/cbi/niu/wireless/ap.lua b/modules/niu/luasrc/model/cbi/niu/wireless/ap.lua index f4e58e994d..54f510dc9e 100644 --- a/modules/niu/luasrc/model/cbi/niu/wireless/ap.lua +++ b/modules/niu/luasrc/model/cbi/niu/wireless/ap.lua @@ -9,12 +9,11 @@ end local function deviceroute(self) cursor:unload("wireless") local d = cursor:get("wireless", "ap", "device") - local h = cursor:get("wireless", d, "type") if d ~= "none" then cursor:delete_all("wireless", "wifi-iface", function(s) return s.device == d and s._niu ~= "1" end) - cursor:set("wireless", d, "disabled", 0) + cursor:set("wireless", d, "disabled", 0) cursor:set("wireless", "ap", "network", "lan") self:set("ap1", load("niu/wireless/ap1")) self:set_route("ap1") diff --git a/modules/niu/luasrc/model/cbi/niu/wireless/ap1.lua b/modules/niu/luasrc/model/cbi/niu/wireless/ap1.lua index a771c231f9..df36eefd81 100644 --- a/modules/niu/luasrc/model/cbi/niu/wireless/ap1.lua +++ b/modules/niu/luasrc/model/cbi/niu/wireless/ap1.lua @@ -230,11 +230,11 @@ end -- Encryption -- - +encr.default = "wep" -- Early default encr.override_values = true encr.override_depends = true encr:value("none", "No Encryption") -encr:value("wep", "WEP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}) +encr:value("wep", "WEP", {mode="ap"}, {mode="sta"}) if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then local hostapd = fs.access("/usr/sbin/hostapd") or os.getenv("LUCI_SYSROOT") @@ -242,11 +242,11 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then if hostapd then --s:taboption("expert", Flag, "_alloweap", "Allow EAP / 802.11i authentication") - encr:value("psk", "WPA", {mode="ap"}, {mode="ap-wds"}) - encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="ap-wds"}) - encr:value("psk-mixed", "WPA + WPA2", {mode="ap"}, {mode="ap-wds"}) - encr:value("psk2", "WPA2", {mode="ap"}, {mode="ap-wds"}) - encr:value("wpa2", "WPA2-EAP (802.11i)", {mode="ap"}, {mode="ap-wds"}) + encr:value("psk", "WPA", {mode="ap"}) + encr:value("wpa", "WPA-EAP", {mode="ap"}) + encr:value("psk-mixed", "WPA + WPA2", {mode="ap"}) + encr:value("psk2", "WPA2", {mode="ap"}) + encr:value("wpa2", "WPA2-EAP (802.11i)", {mode="ap"}) encr.default = "psk-mixed" end elseif hwtype == "broadcom" then |