From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 13 Nov 2011 17:45:01 +0000 (+0000)
Subject: madwifi: backport r28785
X-Git-Tag: backfire_10.03.1~68
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1166d794999eee7e7d875187e115d632e5e61c02;p=openwrt%2Fsvn-archive%2Fopenwrt.git

madwifi: backport r28785

SVN-Revision: 29029
---

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 4f01f008fd..18fef0ab1c 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=madwifi
 
 PKG_REV:=3314
 PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 564741b7ed..754de8bb7b 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -5,14 +5,19 @@ scan_atheros() {
 	local device="$1"
 	local wds
 	local adhoc ahdemo sta ap monitor disabled
-	
+
+	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#wifi}-$ifidx" || vifname="ath${device#wifi}"
+
 		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
@@ -31,6 +36,8 @@ scan_atheros() {
 			;;
 			*) echo "$device($vif): Invalid mode, ignored."; continue;;
 		esac
+
+		ifidx=$(($ifidx + 1))
 	done
 
 	case "${adhoc:+1}:${sta:+1}:${ap:+1}" in
@@ -169,7 +176,7 @@ enable_atheros() {
 		esac
 		
 		[ "$nosbeacon" = 1 ] || nosbeacon=""
-		ifname=$(wlanconfig "$ifname" create wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon})
+		ifname=$(wlanconfig "$ifname" create nounit wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon})
 		[ $? -ne 0 ] && {
 			echo "enable_atheros($device): Failed to set up $mode vif $ifname" >&2
 			continue