qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-20 12:04:42 +02:00
Code

[package] 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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28298 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-09-25 14:14:37 +00:00
parent b920313ef3
commit 23fcdc02ec
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/mac80211/files/lib/wifi/mac80211.sh
View File

@ -262,11 +262,27 @@ disable_mac80211() (
return 0 return 0
) )
get_freq() { get_freq() {
local phy="$1" local phy="$1"
local chan="$2" local chan="$2"
iw "$phy" info | grep -E -m1 "(\* ${chan:-....} MHz${chan:+|\\[$chan\\]})" | grep MHz | awk '{print $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() { enable_mac80211() {
local device="$1" local device="$1"
config_get channel "$device" channel config_get channel "$device" channel
@ -353,17 +369,9 @@ enable_mac80211() {
# which can either be explicitly set in the device # which can either be explicitly set in the device
# section, or automatically generated # section, or automatically generated
config_get macaddr "$device" macaddr config_get macaddr "$device" macaddr
local mac_1="${macaddr%%:*}"
local mac_2="${macaddr#*:}"
config_get vif_mac "$vif" macaddr config_get vif_mac "$vif" macaddr
[ -n "$vif_mac" ] || { [ -n "$vif_mac" ] || {
if [ "$macidx" -gt 0 ]; then vif_mac="$(mac80211_generate_mac $macidx $macaddr)"
offset="$(( 2 + $macidx * 4 ))"
else
offset="0"
fi
vif_mac="$( printf %02x $((0x$mac_1 + $offset)) ):$mac_2"
macidx="$(($macidx + 1))" macidx="$(($macidx + 1))"
} }
[ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac" [ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac"