KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: try to get interface addresses from wiphy sysfs 'addresses' if no mask is set

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43326
This commit is contained in:
Felix Fietkau 2014-11-19 20:17:08 +00:00
parent 1ffcc555ef
commit 4d99db168c
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
View file

@ -326,6 +326,13 @@ ${max_listen_int:+max_listen_interval=$max_listen_int}
EOF EOF
} }
mac80211_get_addr() {
local phy="$1"
local idx="$(($2 + 1))"
head -n $(($macidx + 1)) /sys/class/ieee80211/${phy}/addresses | tail -n1
}
mac80211_generate_mac() { mac80211_generate_mac() {
local phy="$1" local phy="$1"
local id="${macidx:-0}" local id="${macidx:-0}"
@ -333,7 +340,18 @@ mac80211_generate_mac() {
local ref="$(cat /sys/class/ieee80211/${phy}/macaddress)" local ref="$(cat /sys/class/ieee80211/${phy}/macaddress)"
local mask="$(cat /sys/class/ieee80211/${phy}/address_mask)" local mask="$(cat /sys/class/ieee80211/${phy}/address_mask)"
[ "$mask" = "00:00:00:00:00:00" ] && mask="ff:ff:ff:ff:ff:ff"; [ "$mask" = "00:00:00:00:00:00" ] && {
mask="ff:ff:ff:ff:ff:ff";
[ "$(wc -l < /sys/class/ieee80211/${phy}/addresses)" -gt 1 ] && {
addr="$(mac80211_get_addr "$phy" "$id")"
[ -n "$addr" ] && {
echo "$addr"
return
}
}
}
local oIFS="$IFS"; IFS=":"; set -- $mask; IFS="$oIFS" local oIFS="$IFS"; IFS=":"; set -- $mask; IFS="$oIFS"
local mask1=$1 local mask1=$1