Commit 51742a9e authored by Felix Fietkau's avatar Felix Fietkau
Browse files

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: default avatarFelix Fietkau <nbd@nbd.name>
parent 9093cfff

drivers/net/wireless/mediatek/mt76/mt7915/main.c

+3 −3
Original line number Diff line number Diff line
@@ -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);