From 70fb028707c8871ef9e56b3ffa3d895e14956cc4 Mon Sep 17 00:00:00 2001

From: Felix Fietkau <nbd@nbd.name>

Date: Thu, 25 Nov 2021 10:42:12 +0100

Subject: [PATCH] mt76: mt7615: improve wmm index allocation

Git-commit: 70fb028707c8871ef9e56b3ffa3d895e14956cc4

Patch-mainline: v5.17-rc1

References: git-fixes

Typically all AP interfaces on a PHY will share the same WMM settings, while

sta/mesh interfaces will usually inherit the settings from a remote device.

In order minimize the likelihood of conflicting WMM settings, make all AP

interfaces share one slot, and all non-AP interfaces another one.

This also fixes running multiple AP interfaces on MT7613, which only has 3

WMM slots.

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

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/net/wireless/mediatek/mt76/mt7615/main.c | 8 +++-----

 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c

index a0e8db0b27f9..e519fd2879ec 100644

--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c

+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c

@@ -208,11 +208,9 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,

 	mvif->mt76.omac_idx = idx;

 	mvif->mt76.band_idx = ext_phy;

-	if (mt7615_ext_phy(dev))

-		mvif->mt76.wmm_idx = ext_phy * (MT7615_MAX_WMM_SETS / 2) +

-				mvif->mt76.idx % (MT7615_MAX_WMM_SETS / 2);

-	else

-		mvif->mt76.wmm_idx = mvif->mt76.idx % MT7615_MAX_WMM_SETS;

+	mvif->mt76.wmm_idx = vif->type != NL80211_IFTYPE_AP;

+	if (ext_phy)

+		mvif->mt76.wmm_idx += 2;

 	dev->mt76.vif_mask |= BIT(mvif->mt76.idx);

 	dev->omac_mask |= BIT_ULL(mvif->mt76.omac_idx);

-- 

2.31.1