From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 17 Jan 2010 01:52:45 +0000 (+0000)
Subject: mac80211: fix mac address handling for multiple phy/vif
X-Git-Tag: reboot~21408
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8bdee4acf7fac4a8dc0661cf6addbadfa020b959;p=oweals%2Fopenwrt.git

mac80211: fix mac address handling for multiple phy/vif

SVN-Revision: 19177
---

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 82ff958222..dea57223bc 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -81,6 +81,7 @@ enable_mac80211() {
 	find_mac80211_phy "$device" || return 0
 	config_get phy "$device" phy
 	local i=0
+	local macidx=0
 	fixed=""
 
 	[ -n "$country" ] && iw reg set "$country"
@@ -147,12 +148,13 @@ enable_mac80211() {
 
 		config_get vif_mac "$vif" macaddr
 		[ -n "$vif_mac" ] || {
-			if [ "$i" -gt 0 ]; then
-				offset="$(( 2 + $i * 4 ))"
+			if [ "$macidx" -gt 0 ]; then
+				offset="$(( 2 + $macidx * 4 ))"
 			else
 				offset="0"
 			fi
 			vif_mac="$( printf %02x $((0x$mac_1 + $offset)) ):$mac_2"
+			macidx="$(($macidx + 1))"
 		}
 		ifconfig "$ifname" hw ether "$vif_mac"