mac80211: fix mac address handling for multiple phy/vif

[openwrt/svn-archive/archive.git] / package / mac80211 / files / lib / wifi / mac80211.sh

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 942a635f78d5904b9f6d9819dcea9f307f7544b4..dea57223bc7a2a5471f7c63cfe224addfb664ed3 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -81,6 +81,7 @@ enable_mac80211() {
        find_mac80211_phy "$device" || return 0
        config_get phy "$device" phy
        local i=0
+       local macidx=0
        fixed=""
 
        [ -n "$country" ] && iw reg set "$country"
@@ -147,12 +148,13 @@ enable_mac80211() {
 
                config_get vif_mac "$vif" macaddr
                [ -n "$vif_mac" ] || {
-                       if [ "$i" -gt 0 ]; then
-                               offset="$(( 2 + $i * 4 ))"
+                       if [ "$macidx" -gt 0 ]; then
+                               offset="$(( 2 + $macidx * 4 ))"
                        else
                                offset="0"
                        fi
                        vif_mac="$( printf %02x $((0x$mac_1 + $offset)) ):$mac_2"
+                       macidx="$(($macidx + 1))"
                }
                ifconfig "$ifname" hw ether "$vif_mac"
 
@@ -317,7 +319,7 @@ detect_mac80211() {
                mode_band="g"
                channel="5"
                ht_cap=0
-               for cap in $(iw phy "$dev" info | grep 'HT capabilities' | cut -d: -f2); do
+               for cap in $(iw phy "$dev" info | grep 'Capabilities:' | cut -d: -f2); do
                        ht_cap="$(($ht_cap | $cap))"
                done
                ht_capab="";