]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mt76: mt7921: add mt7921_mutex_acquire at mt7921_sta_set_decap_offload
authorSean Wang <sean.wang@mediatek.com>
Fri, 29 Jul 2022 14:44:57 +0000 (22:44 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Oct 2022 07:57:10 +0000 (09:57 +0200)
[ Upstream commit 59c20b91786d5f140ee7be2f24c242b5f8986046 ]

Add mt7921_mutex_acquire at mt7921_[start, stop]_ap to fix the race
with the context holding dev->muxtex and the driver might access the
device in low power state.

Fixes: 24299fc869f7 ("mt76: mt7921: enable rx header traslation offload")
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/mediatek/mt76/mt7921/main.c

index 22c9793e4a4090641f8e003e19fc4417da047773..0316d226e38de0ebbb36de17263a76d8460cb940 100644 (file)
@@ -1390,6 +1390,8 @@ static void mt7921_sta_set_decap_offload(struct ieee80211_hw *hw,
        struct mt7921_sta *msta = (struct mt7921_sta *)sta->drv_priv;
        struct mt7921_dev *dev = mt7921_hw_dev(hw);
 
+       mt7921_mutex_acquire(dev);
+
        if (enabled)
                set_bit(MT_WCID_FLAG_HDR_TRANS, &msta->wcid.flags);
        else
@@ -1397,6 +1399,8 @@ static void mt7921_sta_set_decap_offload(struct ieee80211_hw *hw,
 
        mt76_connac_mcu_sta_update_hdr_trans(&dev->mt76, vif, &msta->wcid,
                                             MCU_UNI_CMD(STA_REC_UPDATE));
+
+       mt7921_mutex_release(dev);
 }
 
 #if IS_ENABLED(CONFIG_IPV6)