X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fwifi.lua;h=43bff5d5279756f57f8dbe2e192dee7173540d9e;hp=079d89549d68472c0560f6ea89d0d9e2c7c9c97d;hb=98996e380a7301ec5127de83e047d0bf8cf3df43;hpb=9cc54c7f15d4a11a1eab5136a255896559511df6

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 079d89549..43bff5d52 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -39,19 +39,9 @@ local hwtype = m:get(arg[1], "type")
 local nsantenna = m:get(arg[1], "antenna")
 
 ch = s:option(Value, "channel", translate("a_w_channel"))
-for i=1, 14 do
-	ch:value(i, i .. " (2.4 GHz)")
+for c, f in luci.util.kspairs(luci.sys.wifi.channels()) do
+	ch:value(c, "%i (%.3f GHz)" %{ c, f })
 end
-for i=36, 64, 4 do
-	ch:value(i, i .. " (5 GHz)")
-end
-for i=100, 140, 4 do
-	ch:value(i, i .. " (5 GHz)")
-end
-ch:value(147, 147 .. " (5 GHz)")
-ch:value(151, 151 .. " (5 GHz)")
-ch:value(155, 155 .. " (5 GHz)")
-ch:value(167, 167 .. " (5 GHz)")
 
 s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
 
@@ -89,6 +79,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
@@ -226,7 +219,7 @@ if hwtype == "atheros" then
 
 	s:option(Flag, "bursting", translate("wifi_bursting")).optional = true
 	s:option(Flag, "turbo", translate("wifi_turbo")).optional = true
-	s:option(Value, "ff", translate("wifi_ff")).optional = true
+	s:option(Flag, "ff", translate("wifi_ff")).optional = true
 
 	s:option(Flag, "wmm", translate("wifi_wmm")).optional = true
 	s:option(Flag, "xr", translate("wifi_xr")).optional = true