aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-09-25 14:14:37 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-09-25 14:14:37 +0000
commit6addd50b9dd73c4dd1042a0fac08b1b526c58e78 (patch)
tree41df12730725c4b464d4d8baa440fef5d8c8fefe
parent4246c6a6b5cfe2a9e7ee1866cb853831ad12452d (diff)
downloadupstream-6addd50b9dd73c4dd1042a0fac08b1b526c58e78.tar.gz
upstream-6addd50b9dd73c4dd1042a0fac08b1b526c58e78.tar.bz2
upstream-6addd50b9dd73c4dd1042a0fac08b1b526c58e78.zip
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
-rw-r--r--package/mac80211/files/lib/wifi/mac80211.sh26
1 files changed, 17 insertions, 9 deletions
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"