Author: nbd Date: 2014-11-19 21:17:08 +0100 (Wed, 19 Nov 2014) New Revision: 43326
Modified: trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh Log: mac80211: try to get interface addresses from wiphy sysfs 'addresses' if no mask is set Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh =================================================================== --- trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh 2014-11-19 20:17:01 UTC (rev 43325) +++ trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh 2014-11-19 20:17:08 UTC (rev 43326) @@ -326,6 +326,13 @@ 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() { local phy="$1" local id="${macidx:-0}" @@ -333,7 +340,18 @@ local ref="$(cat /sys/class/ieee80211/${phy}/macaddress)" 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 mask1=$1 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
