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

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 7b88e7a9e..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")
@@ -166,7 +165,7 @@ if has_sta then
 else
 	ch = s:taboption("general", Value, "channel", translate("Channel"))
 	ch:value("auto", translate("auto"))
-	for _, f in ipairs(iw and iw.freqlist or luci.sys.wifi.channels()) do
+	for _, f in ipairs(iw and iw.freqlist or { }) do
 		if not f.restricted then
 			ch:value(f.channel, "%i (%.3f GHz)" %{ f.channel, f.mhz / 1000 })
 		end
@@ -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
@@ -227,6 +234,18 @@ if hwtype == "mac80211" then
 	s:taboption("advanced", Value, "distance", translate("Distance Optimization"),
 		translate("Distance to farthest network member in meters."))
 
+	-- external antenna profiles
+	local eal = iw and iw.extant
+	if eal and #eal > 0 then
+		ea = s:taboption("advanced", ListValue, "extant", translate("Antenna Configuration"))
+		for _, eap in ipairs(eal) do
+			ea:value(eap.id, "%s (%s)" %{ eap.name, eap.description })
+			if eap.selected then
+				ea.default = eap.id
+			end
+		end
+	end
+
 	s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
 	s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
 end
@@ -384,9 +403,8 @@ mode:value("adhoc", translate("Ad-Hoc"))
 bssid = s:taboption("general", Value, "bssid", translate("<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"))
 
 network = s:taboption("general", Value, "network", translate("Network"),
-	translate("Choose the network you want to attach to this wireless interface. " ..
-		"Select <em>unspecified</em> to not attach any network or fill out the " ..
-		"<em>create</em> field to define a new network."))
+	translate("Choose the network(s) you want to attach to this wireless interface or " ..
+		"fill out the <em>create</em> field to define a new network."))
 
 network.rmempty = true
 network.template = "cbi/network_netlist"