Commit 58bcd4ed authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

wifi: mt76: introduce mt76_queue_is_wed_rx utility routine 



This patch does not change any logic, just improve code readability.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent c36457a8

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

+2 −4
Original line number Diff line number Diff line
@@ -218,8 +218,7 @@ mt76_dma_add_rx_buf(struct mt76_dev *dev, struct mt76_queue *q, 


	ctrl = FIELD_PREP(MT_DMA_CTL_SD_LEN0, buf[0].len);



	if ((q->flags & MT_QFLAG_WED) &&

	    FIELD_GET(MT_QFLAG_WED_TYPE, q->flags) == MT76_WED_Q_RX) {

	if (mt76_queue_is_wed_rx(q)) {

		txwi = mt76_get_rxwi(dev);

		if (!txwi)

			return -ENOMEM;
@@ -401,8 +400,7 @@ mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx, 
	if (info)

		*info = le32_to_cpu(desc->info);



	if ((q->flags & MT_QFLAG_WED) &&

	    FIELD_GET(MT_QFLAG_WED_TYPE, q->flags) == MT76_WED_Q_RX) {

	if (mt76_queue_is_wed_rx(q)) {

		u32 token = FIELD_GET(MT_DMA_CTL_TOKEN,

				      le32_to_cpu(desc->buf1));

		struct mt76_txwi_cache *t = mt76_rx_token_release(dev, token);

drivers/net/wireless/mediatek/mt76/mt76.h

+6 −0
Original line number Diff line number Diff line
@@ -1409,6 +1409,12 @@ s8 mt76_get_rate_power_limits(struct mt76_phy *phy, 
			      struct mt76_power_limits *dest,

			      s8 target_power);



static inline bool mt76_queue_is_wed_rx(struct mt76_queue *q)

{

	return (q->flags & MT_QFLAG_WED) &&

	       FIELD_GET(MT_QFLAG_WED_TYPE, q->flags) == MT76_WED_Q_RX;

}



struct mt76_txwi_cache *

mt76_token_release(struct mt76_dev *dev, int token, bool *wake);

int mt76_token_consume(struct mt76_dev *dev, struct mt76_txwi_cache **ptxwi);

drivers/net/wireless/mediatek/mt76/mt7915/mac.c

+1 −2
Original line number Diff line number Diff line
@@ -256,8 +256,7 @@ mt7915_wed_check_ppe(struct mt7915_dev *dev, struct mt76_queue *q, 
	if (!msta || !msta->vif)

		return;



	if (!(q->flags & MT_QFLAG_WED) ||

	    FIELD_GET(MT_QFLAG_WED_TYPE, q->flags) != MT76_WED_Q_RX)

	if (!mt76_queue_is_wed_rx(q))

		return;



	if (!(info & MT_DMA_INFO_PPE_VLD))