From: Jo-Philipp Wich Date: Tue, 9 Mar 2010 21:23:11 +0000 (+0000) Subject: luci-0.9: merge r5782 X-Git-Tag: 0.9.0~47 X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=508488e961bafc95950cde13416236ad12cf2420;p=project%2Fluci.git luci-0.9: merge r5782 --- 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 b4e8c7b41..02bfa1213 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -68,10 +68,10 @@ if hwtype == "mac80211" then htmode:value("HT40-", translate("wifi_ht40m", "40MHz - 2nd channel below")) htmode:value("HT40+", translate("wifi_ht40p", "40MHz - 2nd channel above")) - htcapab = s:option(DynamicList, "ht_capab", translate("wifi_htcapab", "HT capabilities")) - htcapab:depends("hwmode", "11na") - htcapab:depends("hwmode", "11ng") - + --htcapab = s:option(DynamicList, "ht_capab", translate("wifi_htcapab", "HT capabilities")) + --htcapab:depends("hwmode", "11na") + --htcapab:depends("hwmode", "11ng") + s:option(Value, "country", translate("wifi_country", "Country Code"), translate("wifi_country_iso3166", "Use ISO/IEC 3166 alpha2 country codes.")).optional = true