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

mt76: rely on mt76_queue in tx_queue_skb_raw signature 



This is a preliminary patch to move data queues in mt76_phy and properly
support dbdc

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

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

+1 −2
Original line number Diff line number Diff line
@@ -313,10 +313,9 @@ mt76_dma_dequeue(struct mt76_dev *dev, struct mt76_queue *q, bool flush, 
}



static int

mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid,

mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, struct mt76_queue *q,

			  struct sk_buff *skb, u32 tx_info)

{

	struct mt76_queue *q = dev->q_tx[qid];

	struct mt76_queue_buf buf;

	dma_addr_t addr;

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

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ struct mt76_queue_ops { 
			    struct sk_buff *skb, struct mt76_wcid *wcid,

			    struct ieee80211_sta *sta);



	int (*tx_queue_skb_raw)(struct mt76_dev *dev, enum mt76_txq_id qid,

	int (*tx_queue_skb_raw)(struct mt76_dev *dev, struct mt76_queue *q,

				struct sk_buff *skb, u32 tx_info);



	void *(*dequeue)(struct mt76_dev *dev, struct mt76_queue *q, bool flush,

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

+5 −3
Original line number Diff line number Diff line
@@ -380,9 +380,11 @@ mt7603_ps_tx_list(struct mt7603_dev *dev, struct sk_buff_head *list) 
{

	struct sk_buff *skb;



	while ((skb = __skb_dequeue(list)) != NULL)

		mt76_tx_queue_skb_raw(dev, skb_get_queue_mapping(skb),

				      skb, 0);

	while ((skb = __skb_dequeue(list)) != NULL) {

		int qid = skb_get_queue_mapping(skb);



		mt76_tx_queue_skb_raw(dev, dev->mt76.q_tx[qid], skb, 0);

	}

}



void

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

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ mt7603_mcu_skb_send_msg(struct mt76_dev *mdev, struct sk_buff *skb, 
	if (wait_seq)

		*wait_seq = seq;



	return mt76_tx_queue_skb_raw(dev, MT_TXQ_MCU, skb, 0);

	return mt76_tx_queue_skb_raw(dev, mdev->q_tx[MT_TXQ_MCU], skb, 0);

}



static int

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

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ mt7615_reset_test_set(void *data, u64 val) 
	skb_put(skb, 1);



	mt7615_mutex_acquire(dev);

	mt76_tx_queue_skb_raw(dev, 0, skb, 0);

	mt76_tx_queue_skb_raw(dev, dev->mt76.q_tx[0], skb, 0);

	mt7615_mutex_release(dev);



	return 0;