X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9975b770c81535b2e823a2b4b4bc1f6568720a3f..e5c40dc4c357665c3129ac5ad15943643183c32e:/package/madwifi/files/lib/wifi/madwifi.sh

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 1f22b70af..8a4572db6 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -28,15 +28,22 @@ find_atheros_phy() {
 scan_atheros() {
 	local device="$1"
 	local wds
-	local adhoc ahdemo sta ap monitor
+	local adhoc ahdemo sta ap monitor disabled
 
 	[ ${device%[0-9]} = "wifi" ] && config_set "$device" phy "$device"
+
+	local ifidx=0
 	
 	config_get vifs "$device" vifs
 	for vif in $vifs; do
-	
+		config_get_bool disabled "$vif" disabled 0
+		[ $disabled = 0 ] || continue
+
+		local vifname
+		[ $ifidx -gt 0 ] && vifname="ath${device#radio}-$ifidx" || vifname="ath${device#radio}"
+
 		config_get ifname "$vif" ifname
-		config_set "$vif" ifname "${ifname:-ath}"
+		config_set "$vif" ifname "${ifname:-$vifname}"
 		
 		config_get mode "$vif" mode
 		case "$mode" in
@@ -55,6 +62,8 @@ scan_atheros() {
 			;;
 			*) echo "$device($vif): Invalid mode, ignored."; continue;;
 		esac
+
+		ifidx=$(($ifidx + 1))
 	done
 
 	case "${adhoc:+1}:${sta:+1}:${ap:+1}" in
@@ -203,7 +212,7 @@ enable_atheros() {
 		esac
 
 		[ "$nosbeacon" = 1 ] || nosbeacon=""
-		ifname=$(wlanconfig "$ifname" create wlandev "$phy" wlanmode "$mode" ${nosbeacon:+nosbeacon})
+		ifname=$(wlanconfig "$ifname" create nounit wlandev "$phy" wlanmode "$mode" ${nosbeacon:+nosbeacon})
 		[ $? -ne 0 ] && {
 			echo "enable_atheros($device): Failed to set up $mode vif $ifname" >&2
 			continue
@@ -303,10 +312,10 @@ enable_atheros() {
 		config_get_bool comp "$vif" compression 0
 		iwpriv "$ifname" compression "$comp" >/dev/null 2>&1
 
-		config_get_bool minrate "$vif" minrate
+		config_get minrate "$vif" minrate
 		[ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate"
 
-		config_get_bool maxrate "$vif" maxrate
+		config_get maxrate "$vif" maxrate
 		[ -n "$maxrate" ] && iwpriv "$ifname" maxrate "$maxrate"
 
 		config_get_bool burst "$vif" bursting