From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 23 Apr 2013 16:34:08 +0000 (+0000)
Subject: mac80211: use the original mac address for the first virtual interface
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4e4c5c450223fcbdc9a509edb3e9a3fad202b82a;p=openwrt%2Fsvn-archive%2Fopenwrt.git

mac80211: use the original mac address for the first virtual interface

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

Backport of r36408

SVN-Revision: 36409
---

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 90282d6547..c3fbc5017e 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -285,7 +285,9 @@ mac80211_generate_mac() {
 
 	local oIFS="$IFS"; IFS=":"; set -- $ref; IFS="$oIFS"
 	[ "$((0x$mask1))" -gt 0 ] && {
-		b1=$(((0x$1 | 0x2) ^ ($id << 2)))
+		b1="0x$1"
+		[ "$id" -gt 0 ] && \
+			b1=$((($b1 | 0x2) ^ (($id - 1) << 2)))
 		printf "%02x:%s:%s:%s:%s:%s" $b1 $2 $3 $4 $5 $6
 		return
 	}