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

mt76: remove mt76_queue dependency from tx_complete_skb function pointer 



Remove mt76_queue dependency from tx_complete_skb function pointer and
rely on mt76_tx_qid instead. Remove flush from tx_complete_skb
signature. This is a preliminary patch to introduce mt76_sw_queue
support

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

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

+2 −2
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush) 


		if (entry.skb) {

			spin_unlock_bh(&q->lock);

			dev->drv->tx_complete_skb(dev, q, &entry, flush);

			dev->drv->tx_complete_skb(dev, qid, &entry);

			spin_lock_bh(&q->lock);

		}
@@ -348,7 +348,7 @@ unmap: 
free:

	e.skb = skb;

	e.txwi = t;

	dev->drv->tx_complete_skb(dev, q, &e, true);

	dev->drv->tx_complete_skb(dev, qid, &e);

	mt76_put_txwi(dev, t);

	return ret;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -292,8 +292,8 @@ struct mt76_driver_ops { 
			      struct mt76_wcid *wcid,

			      struct ieee80211_sta *sta, u32 *tx_info);



	void (*tx_complete_skb)(struct mt76_dev *dev, struct mt76_queue *q,

				struct mt76_queue_entry *e, bool flush);

	void (*tx_complete_skb)(struct mt76_dev *dev, enum mt76_txq_id qid,

				struct mt76_queue_entry *e);



	bool (*tx_status_data)(struct mt76_dev *dev, u8 *update);

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

+3 −3
Original line number Diff line number Diff line
@@ -1143,8 +1143,8 @@ out: 
	rcu_read_unlock();

}



void mt7603_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,

			    struct mt76_queue_entry *e, bool flush)

void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,

			    struct mt76_queue_entry *e)

{

	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);

	struct sk_buff *skb = e->skb;
@@ -1154,7 +1154,7 @@ void mt7603_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q, 
		return;

	}



	if (q - dev->mt76.q_tx < 4)

	if (qid < 4)

		dev->tx_hang_check = 0;



	mt76_tx_complete_skb(mdev, skb);

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

+2 −2
Original line number Diff line number Diff line
@@ -227,8 +227,8 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 
			  struct mt76_wcid *wcid, struct ieee80211_sta *sta,

			  u32 *tx_info);



void mt7603_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,

			    struct mt76_queue_entry *e, bool flush);

void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,

			    struct mt76_queue_entry *e);



void mt7603_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,

			 struct sk_buff *skb);

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

+2 −2
Original line number Diff line number Diff line
@@ -757,8 +757,8 @@ void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq) 
	}

}



void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,

			     struct mt76_queue_entry *e, bool flush)

void mt76x02_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,

			     struct mt76_queue_entry *e)

{

	struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);

	struct mt76x02_txwi *txwi;

CRA Git | Maintained and supported by SUSTech CRA and CCSE