X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fmac80211%2Ffiles%2Flib%2Fwifi%2Fmac80211.sh;fp=package%2Fmac80211%2Ffiles%2Flib%2Fwifi%2Fmac80211.sh;h=90282d65476ee096bb4f3491e45e781e71427a98;hb=b4cdc60e29a8948eb0ec94a98e7f54efb8cefdec;hp=31078f1a61e83f06313041bb7688e494bad5339e;hpb=b812c102d1382e7073d164255ffe070b668033d4;p=12.09%2Fopenwrt.git

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 31078f1..90282d6 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -273,19 +273,33 @@ get_freq() {
 }
 
 mac80211_generate_mac() {
-	local off="$1"
-	local mac="$2"
+	local id="$1"
+	local ref="$2"
 	local mask="$3"
-	local oIFS="$IFS"; IFS=":"; set -- $mac; IFS="$oIFS"
 
-	local b2mask=0x00
-	[ $off -gt 0 ] &&
-		[ "$mask" = "00:00:00:00:00:00" -o $(( 0x${mask%%:*} & 0x2 )) -gt 0 ] && b2mask=0x02
+	[ "$mask" = "00:00:00:00:00:00" ] && mask="ff:ff:ff:ff:ff:ff";
+	local oIFS="$IFS"; IFS=":"; set -- $mask; IFS="$oIFS"
 
-	printf "%02x:%s:%s:%s:%02x:%02x" \
-		$(( 0x$1 | $b2mask )) $2 $3 $4 \
-		$(( (0x$5 + ($off / 0x100)) % 0x100 )) \
-		$(( (0x$6 + $off) % 0x100 ))
+	local mask1=$1
+	local mask6=$6
+
+	local oIFS="$IFS"; IFS=":"; set -- $ref; IFS="$oIFS"
+	[ "$((0x$mask1))" -gt 0 ] && {
+		b1=$(((0x$1 | 0x2) ^ ($id << 2)))
+		printf "%02x:%s:%s:%s:%s:%s" $b1 $2 $3 $4 $5 $6
+		return
+	}
+
+	[ "$((0x$mask6))" -lt 255 ] && {
+		printf "%s:%s:%s:%s:%s:%02x" $1 $2 $3 $4 $5 $(( 0x$6 ^ $id ))
+		return
+	}
+
+	off2=$(( (0x$6 + $id) / 0x100 ))
+	printf "%s:%s:%s:%s:%02x:%02x" \
+		$1 $2 $3 $4 \
+		$(( (0x$5 + $off2) % 0x100 )) \
+		$(( (0x$6 + $id) % 0x100 ))
 }
 
 enable_mac80211() {