Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #997 from hnyman/madwifi-cleanup

Browse source 
treewide: cleanup references to madwifi
This commit is contained in:
Hannu Nyman 2017-03-01 09:50:58 +02:00 committed by GitHub
commit 2685855d77
12 changed files with 12 additions and 204 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applications/luci-app-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
View file

@ -103,10 +103,7 @@ uci:foreach("wireless", "wifi-device", function(section)
-- Channel selection
if hwtype == "atheros" then
local cc = util.trim(sys.exec("grep -i '" .. syscc .. "' /lib/wifi/cc_translate.txt |cut -d ' ' -f 2")) or 0
sys.exec('"echo " .. cc .. " > /proc/sys/dev/" .. device .. "/countrycode"')
elseif hwtype == "mac80211" then
if hwtype == "mac80211" then
sys.exec("iw reg set " .. syscc)
elseif hwtype == "broadcom" then
sys.exec ("wlc country " .. syscc)

6
applications/luci-app-statistics/root/usr/bin/stat-genconfig
View file

@ -349,12 +349,6 @@ plugins = {
{ }
},
madwifi = {
{ "WatchSet" },
{ },
{ "Interfaces", "WatchAdds" }
},
memory = {
{ },
{ },

2
contrib/package/freifunk-common/Makefile
View file

@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=freifunk-common
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

6
contrib/package/freifunk-common/files/etc/config/freifunk
View file

@ -104,12 +104,6 @@ config 'defaults' 'wifi_iface'
option 'bssid' '12:CA:FF:EE:BA:BE'
option 'mcast_rate' '6000'
config 'defaults' 'madwifi_wifi_iface'
option 'bgscan' '0'
option 'sw_merge' '1'
option 'probereq' '1'
option 'mcast_rate' '5500'
config 'defaults' 'interface'
option 'netmask' '255.255.0.0'
option 'dns' '8.8.8.8 212.204.49.83 141.1.1.1'

2
contrib/package/meshwizard/Makefile
View file

@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=meshwizard
PKG_RELEASE:=0.3.2
PKG_RELEASE:=0.3.3
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

2
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
# This script renames IB_wifi_ interface names into real interface names used on this system.
# E.g. wireless.IB_wifi0 would become wireless.wifi0 on madwifi and wireless.radio0 on mac80211
# E.g. wireless.IB_wifi0 would become wireless.radio0 on mac80211
. $dir/functions.sh

5
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
View file

@ -59,11 +59,6 @@ uci set wireless.$net\_iface=wifi-iface
# create new wifi-iface for $net from defaults
set_defaults "wifi_iface_" wireless.$net\_iface
# overwrite some settings for type atheros (madwifi)
if [ "$type" = "atheros" ]; then
set_defaults "madwifi_wifi_iface_" wireless.${net}
fi
# overwrite defaults
bssid="$($dir/helpers/gen_bssid.sh $channel $community)"

4
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh
View file

@ -8,9 +8,7 @@ if [ -z "$dev" -o -z "$type" ]; then
exit 1
fi
if [ "$type" = "atheros" ]; then
exit 0
elif [ "$type" = "mac80211" ]; then
if [ "$type" = "mac80211" ]; then
# not hostapd[-mini], no VAP
if [ ! -x /usr/sbin/hostapd ]; then
echo "WARNING: hostapd[-mini] is required to be able to use VAP with mac80211."

2
modules/luci-base/luasrc/model/network.lua
View file

@ -1362,8 +1362,6 @@ function wifidev.get_i18n(self)
local t = "Generic"
if self.iwinfo.type == "wl" then
t = "Broadcom"
elseif self.iwinfo.type == "madwifi" then
t = "Atheros"
end
local m = ""

158
modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
View file

@ -248,64 +248,6 @@ if hwtype == "mac80211" then
end
------------------- Madwifi Device ------------------
if hwtype == "atheros" then
tp = s:taboption("general",
(#tx_power_list > 0) and ListValue or Value,
"txpower", translate("Transmit Power"), "dBm")
tp.rmempty = true
tp.default = tx_power_cur
function tp.cfgvalue(...)
return txpower_current(Value.cfgvalue(...), tx_power_list)
end
tp:value("", translate("auto"))
for _, p in ipairs(tx_power_list) do
tp:value(p.driver_dbm, "%i dBm (%i mW)"
%{ p.display_dbm, p.display_mw })
end
s:taboption("advanced", Flag, "diversity", translate("Diversity")).rmempty = false
if not nsantenna then
ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna"))
ant1.widget = "radio"
ant1.orientation = "horizontal"
ant1:depends("diversity", "")
ant1:value("0", translate("auto"))
ant1:value("1", translate("Antenna 1"))
ant1:value("2", translate("Antenna 2"))
ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("Receiver Antenna"))
ant2.widget = "radio"
ant2.orientation = "horizontal"
ant2:depends("diversity", "")
ant2:value("0", translate("auto"))
ant2:value("1", translate("Antenna 1"))
ant2:value("2", translate("Antenna 2"))
else -- NanoFoo
local ant = s:taboption("advanced", ListValue, "antenna", translate("Transmitter Antenna"))
ant:value("auto")
ant:value("vertical")
ant:value("horizontal")
ant:value("external")
end
s:taboption("advanced", Value, "distance", translate("Distance Optimization"),
translate("Distance to farthest network member in meters."))
s:taboption("advanced", Value, "regdomain", translate("Regulatory Domain"))
s:taboption("advanced", Value, "country", translate("Country Code"))
s:taboption("advanced", Flag, "outdoor", translate("Outdoor Channels"))
--s:option(Flag, "nosbeacon", translate("Disable HW-Beacon timer"))
end
------------------- Broadcom Device ------------------
if hwtype == "broadcom" then
@ -524,100 +466,6 @@ if hwtype == "mac80211" then
end
-------------------- Madwifi Interface ----------------------
if hwtype == "atheros" then
mode:value("ahdemo", translate("Pseudo Ad-Hoc (ahdemo)"))
mode:value("monitor", translate("Monitor"))
mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")})
mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")})
mode:value("wds", translate("Static WDS"))
function mode.write(self, section, value)
if value == "ap-wds" then
ListValue.write(self, section, "ap")
m.uci:set("wireless", section, "wds", 1)
elseif value == "sta-wds" then
ListValue.write(self, section, "sta")
m.uci:set("wireless", section, "wds", 1)
else
ListValue.write(self, section, value)
m.uci:delete("wireless", section, "wds")
end
end
function mode.cfgvalue(self, section)
local mode = ListValue.cfgvalue(self, section)
local wds = m.uci:get("wireless", section, "wds") == "1"
if mode == "ap" and wds then
return "ap-wds"
elseif mode == "sta" and wds then
return "sta-wds"
else
return mode
end
end
bssid:depends({mode="adhoc"})
bssid:depends({mode="ahdemo"})
bssid:depends({mode="wds"})
wdssep = s:taboption("advanced", Flag, "wdssep", translate("Separate WDS"))
wdssep:depends({mode="ap-wds"})
s:taboption("advanced", Flag, "doth", "802.11h")
hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
hidden:depends({mode="ap"})
hidden:depends({mode="adhoc"})
hidden:depends({mode="ap-wds"})
hidden:depends({mode="sta-wds"})
isolate = s:taboption("advanced", Flag, "isolate", translate("Separate Clients"),
translate("Prevents client-to-client communication"))
isolate:depends({mode="ap"})
s:taboption("advanced", Flag, "bgscan", translate("Background Scan"))
mp = s:taboption("macfilter", ListValue, "macpolicy", translate("MAC-Address Filter"))
mp:value("", translate("disable"))
mp:value("allow", translate("Allow listed only"))
mp:value("deny", translate("Allow all except listed"))
ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
ml.datatype = "macaddr"
ml:depends({macpolicy="allow"})
ml:depends({macpolicy="deny"})
nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end)
s:taboption("advanced", Value, "rate", translate("Transmission Rate"))
s:taboption("advanced", Value, "mcast_rate", translate("Multicast Rate"))
s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
s:taboption("advanced", Value, "minrate", translate("Minimum Rate"))
s:taboption("advanced", Value, "maxrate", translate("Maximum Rate"))
s:taboption("advanced", Flag, "compression", translate("Compression"))
s:taboption("advanced", Flag, "bursting", translate("Frame Bursting"))
s:taboption("advanced", Flag, "turbo", translate("Turbo Mode"))
s:taboption("advanced", Flag, "ff", translate("Fast Frames"))
s:taboption("advanced", Flag, "wmm", translate("WMM Mode"))
s:taboption("advanced", Flag, "xr", translate("XR Support"))
s:taboption("advanced", Flag, "ar", translate("AR Support"))
local swm = s:taboption("advanced", Flag, "sw_merge", translate("Disable HW-Beacon timer"))
swm:depends({mode="adhoc"})
local nos = s:taboption("advanced", Flag, "nosbeacon", translate("Disable HW-Beacon timer"))
nos:depends({mode="sta"})
nos:depends({mode="sta-wds"})
local probereq = s:taboption("advanced", Flag, "probereq", translate("Do not send probe responses"))
probereq.enabled = "0"
probereq.disabled = "1"
end
-------------------- Broadcom Interface ----------------------
if hwtype == "broadcom" then
@ -738,7 +586,7 @@ encr:value("none", "No Encryption")
encr:value("wep-open", translate("WEP Open System"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"}, {mode="ahdemo"}, {mode="wds"})
encr:value("wep-shared", translate("WEP Shared Key"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"}, {mode="ahdemo"}, {mode="wds"})
if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
if hwtype == "mac80211" or hwtype == "prism2" then
local supplicant = fs.access("/usr/sbin/wpa_supplicant")
local hostapd = fs.access("/usr/sbin/hostapd")
@ -899,7 +747,7 @@ for slot=1,4 do
end
if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
if hwtype == "mac80211" or hwtype == "prism2" then
-- Probe 802.11r support (and EAP support as a proxy for Openwrt)
local has_80211r = (os.execute("hostapd -v11r 2>/dev/null || hostapd -veap 2>/dev/null") == 0)
@ -1164,7 +1012,7 @@ if hwtype == "mac80211" then
end
end
if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
if hwtype == "mac80211" or hwtype == "prism2" then
local wpasupplicant = fs.access("/usr/sbin/wpa_supplicant")
local hostcli = fs.access("/usr/sbin/hostapd_cli")
if hostcli and wpasupplicant then

4
modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
View file

@ -66,10 +66,6 @@
return name
-- madwifi
elseif name == "ath" or name == "wifi" then
return translatef("Atheros 802.11%s Wireless Controller", bands)
-- ralink
elseif name == "ra" then
return translatef("RaLink 802.11%s Wireless Controller", bands)

20
modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua
View file

@ -156,18 +156,6 @@ end
local hwtype = m:get(wifidevs[1], "type")
if hwtype == "atheros" then
mode = s:option(ListValue, "hwmode", translate("Mode"))
mode.override_values = true
mode:value("", "auto")
mode:value("11b", "802.11b")
mode:value("11g", "802.11g")
mode:value("11a", "802.11a")
mode:value("11bg", "802.11b+g")
mode.rmempty = true
end
ch = s:option(Value, "channel", translate("Channel"))
for i=1, 14 do
ch:value(i, i .. " (2.4 GHz)")
@ -224,7 +212,7 @@ encr.override_values = true
encr:value("none", "No Encryption")
encr:value("wep", "WEP")
if hwtype == "atheros" or hwtype == "mac80211" then
if hwtype == "mac80211" then
local supplicant = fs.access("/usr/sbin/wpa_supplicant")
local hostapd = fs.access("/usr/sbin/hostapd")
@ -288,7 +276,7 @@ port:depends({mode="ap", encryption="wpa2"})
port.rmempty = true
if hwtype == "atheros" or hwtype == "mac80211" then
if hwtype == "mac80211" then
nasid = s:option(Value, "nasid", translate("NAS ID"))
nasid:depends({mode="ap", encryption="wpa"})
nasid:depends({mode="ap", encryption="wpa2"})
@ -339,7 +327,7 @@ if hwtype == "atheros" or hwtype == "mac80211" then
end
if hwtype == "atheros" or hwtype == "broadcom" then
if hwtype == "broadcom" then
iso = s:option(Flag, "isolate", translate("AP-Isolation"), translate("Prevents Client to Client communication"))
iso.rmempty = true
iso:depends("mode", "ap")
@ -349,7 +337,7 @@ if hwtype == "atheros" or hwtype == "broadcom" then
hide:depends("mode", "ap")
end
if hwtype == "mac80211" or hwtype == "atheros" then
if hwtype == "mac80211" then
bssid:depends({mode="adhoc"})
end