From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 11 Oct 2014 09:53:05 +0000 (+0200)
Subject: Merge pull request #221 from openwrt-es/luci-next
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=7ee4e9c78acccd7bdb6ec33a464bc67459068641;hp=bb388f0873b5f9b88c45af5c7d35e9eb9f4ac8ac

Merge pull request #221 from openwrt-es/luci-next

modules/admin-full: fix support for broadcom-wl modes
---

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 f6becf0f4..7d84d2961 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -353,10 +353,25 @@ if hwtype == "broadcom" then
 	end
 
 	mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode"))
-	mode:value("11bg", "802.11b+g")
-	mode:value("11b", "802.11b")
-	mode:value("11g", "802.11g")
-	mode:value("11gst", "802.11g + Turbo")
+	if hw_modes.n then
+		if hw_modes.g then mode:value("11ng", "802.11g+n") end
+		if hw_modes.a then mode:value("11na", "802.11a+n") end
+		mode:value("11n", "802.11n")
+
+		htmode = s:taboption("advanced", ListValue, "htmode", translate("HT mode (802.11n)"))
+		htmode:depends("hwmode", "11n")
+		htmode:depends("hwmode", "11ng")
+		htmode:depends("hwmode", "11na")
+		htmode:value("HT20", "20MHz")
+		htmode:value("HT40-", translate("40MHz 2nd channel below"))
+		htmode:value("HT40+", translate("40MHz 2nd channel above"))
+	end
+	if hw_modes.a then mode:value("11a", "802.11a") end
+	if hw_modes.b and hw_modes.g then mode:value("11bg", "802.11b+g") end
+	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.g then mode:value("11gst", "802.11g Turbo") end
+	if hw_modes.g then mode:value("11lrs", "802.11g Limited Rate Support") end
 
 	ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna"))
 	ant1.widget = "radio"