mt76: mt7915: make vif index per adapter instead of per band

The firmware treats it as global, so we need to avoid collisions here

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 8b8d0d2d532b51cdbba5640103947189cf95a2d2..3f79fcde9a85fd98fffc84e0265926fd9ea28ac0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -161,7 +161,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
            is_zero_ether_addr(vif->addr))
                phy->monitor_vif = vif;
 
-       mvif->idx = ffs(~phy->mt76->vif_mask) - 1;
+       mvif->idx = ffs(~dev->mphy.vif_mask) - 1;
        if (mvif->idx >= MT7915_MAX_INTERFACES) {
                ret = -ENOSPC;
                goto out;
@@ -186,7 +186,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
        if (ret)
                goto out;
 
-       phy->mt76->vif_mask |= BIT(mvif->idx);
+       dev->mphy.vif_mask |= BIT(mvif->idx);
        phy->omac_mask |= BIT_ULL(mvif->omac_idx);
 
        idx = MT7915_WTBL_RESERVED - mvif->idx;
@@ -241,7 +241,7 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,
        rcu_assign_pointer(dev->mt76.wcid[idx], NULL);
 
        mutex_lock(&dev->mt76.mutex);
-       phy->mt76->vif_mask &= ~BIT(mvif->idx);
+       dev->mphy.vif_mask &= ~BIT(mvif->idx);
        phy->omac_mask &= ~BIT_ULL(mvif->omac_idx);
        mutex_unlock(&dev->mt76.mutex);