]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mt76: mt7915: disable tx worker during tx BA session enable/disable
authorFelix Fietkau <nbd@nbd.name>
Tue, 27 Aug 2024 09:29:54 +0000 (11:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Oct 2024 10:00:15 +0000 (12:00 +0200)
[ Upstream commit 256cbd26fbafb30ba3314339106e5c594e9bd5f9 ]

Avoids firmware race condition.

Link: https://patch.msgid.link/20240827093011.18621-7-nbd@nbd.name
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

index 9599adf104b160bbc5e703a34d6f95f51cca4b69..758249b20c22295c6d255bd76a8d2fd765688ef5 100644 (file)
@@ -690,13 +690,17 @@ int mt7915_mcu_add_tx_ba(struct mt7915_dev *dev,
 {
        struct mt7915_sta *msta = (struct mt7915_sta *)params->sta->drv_priv;
        struct mt7915_vif *mvif = msta->vif;
+       int ret;
 
+       mt76_worker_disable(&dev->mt76.tx_worker);
        if (enable && !params->amsdu)
                msta->wcid.amsdu = false;
+       ret = mt76_connac_mcu_sta_ba(&dev->mt76, &mvif->mt76, params,
+                                    MCU_EXT_CMD(STA_REC_UPDATE),
+                                    enable, true);
+       mt76_worker_enable(&dev->mt76.tx_worker);
 
-       return mt76_connac_mcu_sta_ba(&dev->mt76, &mvif->mt76, params,
-                                     MCU_EXT_CMD(STA_REC_UPDATE),
-                                     enable, true);
+       return ret;
 }
 
 int mt7915_mcu_add_rx_ba(struct mt7915_dev *dev,