[backfire] mac80211: merge r28784

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@29030 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 1ae0c208380ce67564471596b1f7afec5712b863..738c2aa412453a43b8c84567bc93c0c6fd6c0400 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -329,13 +329,9 @@ enable_mac80211() {
 
        wifi_fixup_hwmode "$device" "g"
        for vif in $vifs; do
-               while [ -d "/sys/class/net/wlan$i" ]; do
-                       i=$(($i + 1))
-               done
-
                config_get ifname "$vif" ifname
                [ -n "$ifname" ] || {
-                       ifname="wlan$i"
+                       [ $i -gt 0 ] && ifname="wlan${phy#phy}-$i" || ifname="wlan${phy#phy}"
                }
                config_set "$vif" ifname "$ifname"
 
@@ -351,7 +347,6 @@ enable_mac80211() {
                                # Hostapd will handle recreating the interface and
                                # it's accompanying monitor
                                apidx="$(($apidx + 1))"
-                               i=$(($i + 1))
                                [ "$apidx" -gt 1 ] || iw phy "$phy" interface add "$ifname" type managed
                        ;;
                        mesh)
@@ -404,6 +399,8 @@ enable_mac80211() {
                # wifi-device) if the latter doesn't exist
                txpower="${txpower:-$vif_txpower}"
                [ -z "$txpower" ] || iw dev "$ifname" set txpower fixed "${txpower%%.*}00"
+
+               i=$(($i + 1))
        done
 
        local start_hostapd=