From 6addd50b9dd73c4dd1042a0fac08b1b526c58e78 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 25 Sep 2011 14:14:37 +0000
Subject: mac80211: rework mac address generation for virtual interfaces; set
locally administered bit on generated macs and change the last two bytes
isntead of the first one
SVN-Revision: 28298
---
package/mac80211/files/lib/wifi/mac80211.sh | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
(limited to 'package/mac80211/files')
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 4b254289d0..72549092bf 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -262,11 +262,27 @@ disable_mac80211() (
return 0
)
+
get_freq() {
local phy="$1"
local chan="$2"
iw "$phy" info | grep -E -m1 "(\* ${chan:-....} MHz${chan:+|\\[$chan\\]})" | grep MHz | awk '{print $2}'
}
+
+mac80211_generate_mac() {
+ local off="$1"
+ local mac="$2"
+ local oIFS="$IFS"; IFS=":"; set -- $mac; IFS="$oIFS"
+
+ local b2mask=0x00
+ [ $off -gt 0 ] && b2mask=0x02
+
+ printf "%02x:%s:%s:%s:%02x:%02x" \
+ $(( 0x$1 | $b2mask )) $2 $3 $4 \
+ $(( (0x$5 + ($off / 0x100)) % 0x100 )) \
+ $(( (0x$6 + $off) % 0x100 ))
+}
+
enable_mac80211() {
local device="$1"
config_get channel "$device" channel
@@ -353,17 +369,9 @@ enable_mac80211() {
# which can either be explicitly set in the device
# section, or automatically generated
config_get macaddr "$device" macaddr
- local mac_1="${macaddr%%:*}"
- local mac_2="${macaddr#*:}"
-
config_get vif_mac "$vif" macaddr
[ -n "$vif_mac" ] || {
- if [ "$macidx" -gt 0 ]; then
- offset="$(( 2 + $macidx * 4 ))"
- else
- offset="0"
- fi
- vif_mac="$( printf %02x $((0x$mac_1 + $offset)) ):$mac_2"
+ vif_mac="$(mac80211_generate_mac $macidx $macaddr)"
macidx="$(($macidx + 1))"
}
[ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac"
--
cgit v1.2.3