Commit d08295f5 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: pass original queue id from __mt76_tx_queue_skb to the driver 



MT7615 and newer map multiple software tx queues to the hardware id

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

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

+3 −3
Original line number Diff line number Diff line
@@ -349,8 +349,8 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, struct mt76_queue *q, 


static int

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

		      struct sk_buff *skb, struct mt76_wcid *wcid,

		      struct ieee80211_sta *sta)

		      enum mt76_txq_id qid, struct sk_buff *skb,

		      struct mt76_wcid *wcid, struct ieee80211_sta *sta)

{

	struct ieee80211_tx_status status = {

		.sta = sta,
@@ -406,7 +406,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, 


	dma_sync_single_for_cpu(dev->dma_dev, t->dma_addr, dev->drv->txwi_size,

				DMA_TO_DEVICE);

	ret = dev->drv->tx_prepare_skb(dev, txwi, q->qid, wcid, sta, &tx_info);

	ret = dev->drv->tx_prepare_skb(dev, txwi, qid, wcid, sta, &tx_info);

	dma_sync_single_for_device(dev->dma_dev, t->dma_addr, dev->drv->txwi_size,

				   DMA_TO_DEVICE);

	if (ret < 0)

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

+2 −2
Original line number Diff line number Diff line
@@ -223,8 +223,8 @@ struct mt76_queue_ops { 
		     u32 ring_base);



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

			    struct sk_buff *skb, struct mt76_wcid *wcid,

			    struct ieee80211_sta *sta);

			    enum mt76_txq_id qid, struct sk_buff *skb,

			    struct mt76_wcid *wcid, struct ieee80211_sta *sta);



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

				struct sk_buff *skb, u32 tx_info);

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

+3 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ mt7603_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif) 
	if (!skb)

		return;



	mt76_tx_queue_skb(dev, dev->mphy.q_tx[MT_TXQ_BEACON], skb,

			  &mvif->sta.wcid, NULL);

	mt76_tx_queue_skb(dev, dev->mphy.q_tx[MT_TXQ_BEACON],

			  MT_TXQ_BEACON, skb, &mvif->sta.wcid, NULL);



	spin_lock_bh(&dev->ps_lock);

	mt76_wr(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY |
@@ -123,7 +123,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t) 
		struct ieee80211_vif *vif = info->control.vif;

		struct mt7603_vif *mvif = (struct mt7603_vif *)vif->drv_priv;



		mt76_tx_queue_skb(dev, q, skb, &mvif->sta.wcid, NULL);

		mt76_tx_queue_skb(dev, q, MT_TXQ_CAB, skb, &mvif->sta.wcid, NULL);

	}

	mt76_queue_kick(dev, q);

	spin_unlock(&q->lock);

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

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ static void mt76x02_pre_tbtt_tasklet(struct tasklet_struct *t) 
		struct ieee80211_vif *vif = info->control.vif;

		struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;



		mt76_tx_queue_skb(dev, q, skb, &mvif->group_wcid, NULL);

		mt76_tx_queue_skb(dev, q, MT_TXQ_PSD, skb, &mvif->group_wcid,

				  NULL);

	}

	spin_unlock(&q->lock);

}

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

+3 −3
Original line number Diff line number Diff line
@@ -517,8 +517,8 @@ static void mt76s_tx_status_data(struct work_struct *work) 


static int

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

		   struct sk_buff *skb, struct mt76_wcid *wcid,

		   struct ieee80211_sta *sta)

		   enum mt76_txq_id qid, struct sk_buff *skb,

		   struct mt76_wcid *wcid, struct ieee80211_sta *sta)

{

	struct mt76_tx_info tx_info = {

		.skb = skb,
@@ -530,7 +530,7 @@ mt76s_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, 
		return -ENOSPC;



	skb->prev = skb->next = NULL;

	err = dev->drv->tx_prepare_skb(dev, NULL, q->qid, wcid, sta, &tx_info);

	err = dev->drv->tx_prepare_skb(dev, NULL, qid, wcid, sta, &tx_info);

	if (err < 0)

		return err;