wifi: mt76: mt7996: Fix mt7996_mcu_sta_ba wcid configuration

Fix the wcid pointer used in mt7996_mcu_sta_ba routine to properly
support MLO scenario.

Fixes: 98686cd21624c ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices")
Signed-off-by: Lorenzo Bianconi <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Lorenzo Bianconi
2025-07-18 19:39:31 +02:00
committed by Felix Fietkau
parent 00275548ba
commit 2601bb91e0
3 changed files with 13 additions and 8 deletions
+4 -2
View File
@@ -1328,11 +1328,13 @@ mt7996_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
case IEEE80211_AMPDU_RX_START:
mt76_rx_aggr_start(&dev->mt76, &msta_link->wcid, tid,
ssn, params->buf_size);
ret = mt7996_mcu_add_rx_ba(dev, params, link, true);
ret = mt7996_mcu_add_rx_ba(dev, params, link,
msta_link, true);
break;
case IEEE80211_AMPDU_RX_STOP:
mt76_rx_aggr_stop(&dev->mt76, &msta_link->wcid, tid);
ret = mt7996_mcu_add_rx_ba(dev, params, link, false);
ret = mt7996_mcu_add_rx_ba(dev, params, link,
msta_link, false);
break;
case IEEE80211_AMPDU_TX_OPERATIONAL:
mtxq->aggr = true;
+7 -5
View File
@@ -1149,9 +1149,8 @@ int mt7996_mcu_set_timing(struct mt7996_phy *phy, struct ieee80211_vif *vif,
static int
mt7996_mcu_sta_ba(struct mt7996_dev *dev, struct mt76_vif_link *mvif,
struct ieee80211_ampdu_params *params,
bool enable, bool tx)
struct mt76_wcid *wcid, bool enable, bool tx)
{
struct mt76_wcid *wcid = (struct mt76_wcid *)params->sta->drv_priv;
struct sta_rec_ba_uni *ba;
struct sk_buff *skb;
struct tlv *tlv;
@@ -1185,14 +1184,17 @@ int mt7996_mcu_add_tx_ba(struct mt7996_dev *dev,
if (enable && !params->amsdu)
msta_link->wcid.amsdu = false;
return mt7996_mcu_sta_ba(dev, &link->mt76, params, enable, true);
return mt7996_mcu_sta_ba(dev, &link->mt76, params, &msta_link->wcid,
enable, true);
}
int mt7996_mcu_add_rx_ba(struct mt7996_dev *dev,
struct ieee80211_ampdu_params *params,
struct mt7996_vif_link *link, bool enable)
struct mt7996_vif_link *link,
struct mt7996_sta_link *msta_link, bool enable)
{
return mt7996_mcu_sta_ba(dev, &link->mt76, params, enable, false);
return mt7996_mcu_sta_ba(dev, &link->mt76, params, &msta_link->wcid,
enable, false);
}
static void
+2 -1
View File
@@ -608,7 +608,8 @@ int mt7996_mcu_add_tx_ba(struct mt7996_dev *dev,
struct mt7996_sta_link *msta_link, bool enable);
int mt7996_mcu_add_rx_ba(struct mt7996_dev *dev,
struct ieee80211_ampdu_params *params,
struct mt7996_vif_link *link, bool enable);
struct mt7996_vif_link *link,
struct mt7996_sta_link *msta_link, bool enable);
int mt7996_mcu_update_bss_color(struct mt7996_dev *dev,
struct mt76_vif_link *mlink,
struct cfg80211_he_bss_color *he_bss_color);