projects
/
openwrt
/
staging
/
chunkeey.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4246c6a
)
mac80211: rework mac address generation for virtual interfaces; set locally administe...
author
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 25 Sep 2011 14:14:37 +0000
(14:14 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 25 Sep 2011 14:14:37 +0000
(14:14 +0000)
SVN-Revision: 28298
package/mac80211/files/lib/wifi/mac80211.sh
patch
|
blob
|
history
diff --git
a/package/mac80211/files/lib/wifi/mac80211.sh
b/package/mac80211/files/lib/wifi/mac80211.sh
index 4b254289d0d8f1f7ab341dcb01a4903fca5afa23..72549092bf5891ee3596b2053f992053a8cbbcc0 100644
(file)
--- a/
package/mac80211/files/lib/wifi/mac80211.sh
+++ b/
package/mac80211/files/lib/wifi/mac80211.sh
@@
-262,11
+262,27
@@
disable_mac80211() (
return 0
)
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}'
}
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
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
# 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" ] || {
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"
macidx="$(($macidx + 1))"
}
[ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac"