mt76: mt76x02: only update the base mac address if necessary
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/1 mt76: mt76x02: only update the base mac address if necessary
Also update the mask first before calculating the vif index. Fixes an issue where adding back the same interfaces in a different order fails because of duplicate vif index use
Fixes 06662264ce2ad ("mt76x02: use mask for vifs")
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +6 -4
@@ -293,6 +293,12 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)struct mt76x02_dev *dev = hw->priv;unsigned int idx =0 ; +/* Allow to change address in HW if we create first interface. */ +if (!dev->vif_mask && + (((vif->addr[0 ] ^ dev->mt76.macaddr[0 ]) & ~GENMASK (4 ,1 )) || +memcmp (vif->addr +1 , dev->mt76.macaddr +1 ,ETH_ALEN -1 ))) +mt76x02_mac_setaddr (dev, vif->addr); +if (vif->addr[0 ] &BIT (1 )) idx =1 + (((dev->mt76.macaddr[0 ] ^ vif->addr[0 ]) >>2 ) &7 );
@@ -315,10 +321,6 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)if (dev->vif_mask &BIT (idx))return -EBUSY ; -/* Allow to change address in HW if we create first interface. */ -if (!dev->vif_mask && !ether_addr_equal (dev->mt76.macaddr, vif->addr)) -mt76x02_mac_setaddr (dev, vif->addr); - dev->vif_mask |=BIT (idx);mt76x02_vif_init (dev, vif, idx);
Signature · 1 line
2.17.0