diff options
| author | John Crispin <john@openwrt.org> | 2013-03-12 13:52:20 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-03-12 13:52:20 +0000 |
| commit | d0ddec11bb0d0a40691456615c64fa61d9cb5465 (patch) | |
| tree | 8431a01d645319350be3bd9bbf6dbca8cb64e6eb | |
| parent | 76934b677993cee490c8814684457f26ed39d27a (diff) | |
| download | upstream-d0ddec11bb0d0a40691456615c64fa61d9cb5465.tar.gz upstream-d0ddec11bb0d0a40691456615c64fa61d9cb5465.tar.bz2 upstream-d0ddec11bb0d0a40691456615c64fa61d9cb5465.zip | |
fixes mbssid on ralink hardware
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 35986
| -rw-r--r-- | package/mac80211/files/lib/wifi/mac80211.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index 1ad3eb5086..4c214e84c5 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -272,10 +272,12 @@ get_freq() { mac80211_generate_mac() { local off="$1" local mac="$2" + local mask="$3" local oIFS="$IFS"; IFS=":"; set -- $mac; IFS="$oIFS" local b2mask=0x00 - [ $off -gt 0 ] && b2mask=0x02 + [ $off -gt 0 ] && + [ "$mask" = "00:00:00:00:00:00" -o $(( 0x${mask%%:*} & 0x2 )) -gt 0 ] && b2mask=0x02 printf "%02x:%s:%s:%s:%02x:%02x" \ $(( 0x$1 | $b2mask )) $2 $3 $4 \ @@ -375,7 +377,7 @@ enable_mac80211() { config_get macaddr "$device" macaddr config_get vif_mac "$vif" macaddr [ -n "$vif_mac" ] || { - vif_mac="$(mac80211_generate_mac $macidx $macaddr)" + vif_mac="$(mac80211_generate_mac $macidx $macaddr $(cat /sys/class/ieee80211/${phy}/address_mask))" macidx="$(($macidx + 1))" } [ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac" |