X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fwifi.lua;h=4ae2f77765c013eabba7bd34f9681b04844a7d03;hb=c9f7282d982f10e54fbc083c20e45e03052598fe;hp=f645493a61d17c6cb17df308f33df1b0b33e6b57;hpb=02ac6686fe8165a3965fd79e3fb32aaf1f831c79;p=project%2Fluci.git

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 f645493a6..4ae2f7776 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -61,7 +61,7 @@ function m.parse(map)
 		wdev:set("disabled", nil)
 
 		nw:commit("wireless")
-		luci.sys.call("(env -i /sbin/wifi down; env -i /sbin/wifi up) >/dev/null 2>/dev/null")
+		luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null")
 
 		luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless", arg[1]))
 		return
@@ -143,7 +143,6 @@ end
 
 
 local hwtype = wdev:get("type")
-local htcaps = wdev:get("ht_capab") and true or false
 
 -- NanoFoo
 local nsantenna = wdev:get("antenna")
@@ -191,26 +190,34 @@ if hwtype == "mac80211" then
 		end
 	end
 
-	mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode"))
-	mode:value("", translate("auto"))
-	if hw_modes.b then mode:value("11b", "802.11b") end
-	if hw_modes.g then mode:value("11g", "802.11g") end
-	if hw_modes.a then mode:value("11a", "802.11a") end
+	mode = s:taboption("advanced", ListValue, "hwmode", translate("Band"))
 
-	if htcaps then
-		if hw_modes.g and hw_modes.n then mode:value("11ng", "802.11g+n") end
-		if hw_modes.a and hw_modes.n then mode:value("11na", "802.11a+n") end
+	if hw_modes.n then
+		if hw_modes.g then mode:value("11g", "2.4GHz (802.11g+n)") end
+		if hw_modes.a then mode:value("11a", "5GHz (802.11a+n)") end
 
-		htmode = s:taboption("advanced", ListValue, "htmode", translate("HT mode"))
-		htmode:depends("hwmode", "11na")
-		htmode:depends("hwmode", "11ng")
+		htmode = s:taboption("advanced", ListValue, "htmode", translate("HT mode (802.11n)"))
+		htmode:value("", translate("disabled"))
 		htmode:value("HT20", "20MHz")
-		htmode:value("HT40-", translate("40MHz 2nd channel below"))
-		htmode:value("HT40+", translate("40MHz 2nd channel above"))
+		htmode:value("HT40", "40MHz")
+
+		function mode.cfgvalue(...)
+			local v = Value.cfgvalue(...)
+			if v == "11na" then
+				return "11a"
+			elseif v == "11ng" then
+				return "11g"
+			end
+			return v
+		end
 
-		--htcapab = s:taboption("advanced", DynamicList, "ht_capab", translate("HT capabilities"))
-		--htcapab:depends("hwmode", "11na")
-		--htcapab:depends("hwmode", "11ng")
+		noscan = s:taboption("advanced", Flag, "noscan", translate("Force 40MHz mode"),
+			translate("Always use 40MHz channels even if the secondary channel overlaps. Using this option does not comply with IEEE 802.11n-2009!"))
+		noscan:depends("htmode", "HT40")
+		noscan.default = noscan.disabled
+	else
+		if hw_modes.g then mode:value("11g", "2.4GHz (802.11g)") end
+		if hw_modes.a then mode:value("11a", "5GHz (802.11a)") end
 	end
 
 	local cl = iw and iw.countrylist