OpenWrt
/
luci
mirror of https://git.openwrt.org/project/luci.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

meshwizard: cleanup references to madwifi 

Remove the code related to the deprecated madwifi driver.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2017-02-28 18:57:31 +02:00
parent 7ab9b5a714
commit 04cf8763cc
5 changed files with 4 additions and 14 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 -- Channel selection
if hwtype == "atheros" then if hwtype == "mac80211" 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
sys.exec("iw reg set " .. syscc) sys.exec("iw reg set " .. syscc)
elseif hwtype == "broadcom" then elseif hwtype == "broadcom" then
sys.exec ("wlc country " .. syscc) sys.exec ("wlc country " .. syscc)

2
contrib/package/meshwizard/Makefile
View File

@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=meshwizard PKG_NAME:=meshwizard
PKG_RELEASE:=0.3.2 PKG_RELEASE:=0.3.3
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) 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 #!/bin/sh
# This script renames IB_wifi_ interface names into real interface names used on this system. # 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 . $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 # create new wifi-iface for $net from defaults
set_defaults "wifi_iface_" wireless.$net\_iface 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 # overwrite defaults
bssid="$($dir/helpers/gen_bssid.sh $channel $community)" 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 exit 1
fi fi
if [ "$type" = "atheros" ]; then if [ "$type" = "mac80211" ]; then
exit 0
elif [ "$type" = "mac80211" ]; then
# not hostapd[-mini], no VAP # not hostapd[-mini], no VAP
if [ ! -x /usr/sbin/hostapd ]; then if [ ! -x /usr/sbin/hostapd ]; then
echo "WARNING: hostapd[-mini] is required to be able to use VAP with mac80211." echo "WARNING: hostapd[-mini] is required to be able to use VAP with mac80211."