wifi: mt76: mt7915: allocate vif wcid in the same range as stations

Reduces the amount of unnecessary WTBL bank switching, while still reserving
WTBL entries for vifs.

Link: https://patch.msgid.link/20240827093011.18621-8-nbd@nbd.name
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 87a7b1589af20d16e086b6a967021ac8feee2f2e..a89674d6b6029a98fb1f0b7957dfc5a583948089 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -245,7 +245,9 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
        dev->mt76.vif_mask |= BIT_ULL(mvif->mt76.idx);
        phy->omac_mask |= BIT_ULL(mvif->mt76.omac_idx);
 
-       idx = MT7915_WTBL_RESERVED - mvif->mt76.idx;
+       idx = mt76_wcid_alloc(dev->mt76.wcid_mask, mt7915_wtbl_size(dev));
+       if (idx < 0)
+               return -ENOSPC;
 
        INIT_LIST_HEAD(&mvif->sta.rc_list);
        INIT_LIST_HEAD(&mvif->sta.wcid.poll_list);
@@ -292,6 +294,7 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,
 
        mt7915_mcu_add_bss_info(phy, vif, false);
        mt7915_mcu_add_sta(dev, vif, NULL, false);
+       mt76_wcid_mask_clear(dev->mt76.wcid_mask, mvif->sta.wcid.idx);
 
        mutex_lock(&dev->mt76.mutex);
        mt76_testmode_reset(phy->mt76, true);