Commit 1a817fa7 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: add missing locking around ampdu action 



This is needed primarily to avoid races in dealing with rx aggregation
related data structures

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 36f7e2b2

drivers/net/wireless/mediatek/mt76/mt7603/main.c

+2 −0
Original line number Diff line number Diff line
@@ -575,6 +575,7 @@ mt7603_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	mtxq = (struct mt76_txq *)txq->drv_priv;



	mutex_lock(&dev->mt76.mutex);

	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		mt76_rx_aggr_start(&dev->mt76, &msta->wcid, tid, ssn,
@@ -603,6 +604,7 @@ mt7603_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;

	}

	mutex_unlock(&dev->mt76.mutex);



	return 0;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	mtxq = (struct mt76_txq *)txq->drv_priv;



	mutex_lock(&dev->mt76.mutex);

	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		mt76_rx_aggr_start(&dev->mt76, &msta->wcid, tid, ssn,
@@ -518,6 +519,7 @@ mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;

	}

	mutex_unlock(&dev->mt76.mutex);



	return 0;

}

drivers/net/wireless/mediatek/mt76/mt76x02_util.c

+2 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ int mt76x02_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	mtxq = (struct mt76_txq *)txq->drv_priv;



	mutex_lock(&dev->mt76.mutex);

	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		mt76_rx_aggr_start(&dev->mt76, &msta->wcid, tid,
@@ -400,6 +401,7 @@ int mt76x02_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;

	}

	mutex_unlock(&dev->mt76.mutex);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE