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

mt76: remove mt76_queue dependency from tx_queue_skb function pointer 



Remove mt76_queue dependency from tx_queue_skb function pointer and
rely on mt76_tx_qid instead. 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 b1bfbe70

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

+2 −1
Original line number Diff line number Diff line
@@ -278,10 +278,11 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid, 
	return 0;

}



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

int mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,

			  struct sk_buff *skb, struct mt76_wcid *wcid,

			  struct ieee80211_sta *sta)

{

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

	struct mt76_queue_entry e;

	struct mt76_txwi_cache *t;

	struct mt76_queue_buf buf[32];

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

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ struct mt76_queue_ops { 
		       struct mt76_queue_buf *buf, int nbufs, u32 info,

		       struct sk_buff *skb, void *txwi);



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

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

			    struct sk_buff *skb, struct mt76_wcid *wcid,

			    struct ieee80211_sta *sta);
@@ -647,7 +647,7 @@ static inline struct mt76_tx_cb *mt76_tx_skb_cb(struct sk_buff *skb) 
	return ((void *) IEEE80211_SKB_CB(skb)->status.status_driver_data);

}



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

int mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,

			  struct sk_buff *skb, struct mt76_wcid *wcid,

			  struct ieee80211_sta *sta);

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

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

		return;



	mt76_dma_tx_queue_skb(&dev->mt76, &dev->mt76.q_tx[MT_TXQ_BEACON], skb,

	mt76_dma_tx_queue_skb(&dev->mt76, MT_TXQ_BEACON, skb,

			      &mvif->sta.wcid, NULL);



	spin_lock_bh(&dev->ps_lock);
@@ -118,8 +118,8 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg) 
		struct ieee80211_vif *vif = info->control.vif;

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



		mt76_dma_tx_queue_skb(&dev->mt76, q, skb, &mvif->sta.wcid,

				      NULL);

		mt76_dma_tx_queue_skb(&dev->mt76, MT_TXQ_CAB, skb,

				      &mvif->sta.wcid, NULL);

	}

	mt76_queue_kick(dev, q);

	spin_unlock_bh(&q->lock);

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

+2 −2
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ static void mt76x02_pre_tbtt_tasklet(unsigned long arg) 
		struct ieee80211_vif *vif = info->control.vif;

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



		mt76_dma_tx_queue_skb(&dev->mt76, q, skb, &mvif->group_wcid,

				      NULL);

		mt76_dma_tx_queue_skb(&dev->mt76, MT_TXQ_PSD, skb,

				      &mvif->group_wcid, NULL);

	}

	spin_unlock_bh(&q->lock);

}

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

+5 −5
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ mt76_tx(struct mt76_dev *dev, struct ieee80211_sta *sta, 
	q = &dev->q_tx[qid];



	spin_lock_bh(&q->lock);

	dev->queue_ops->tx_queue_skb(dev, q, skb, wcid, sta);

	dev->queue_ops->tx_queue_skb(dev, qid, skb, wcid, sta);

	dev->queue_ops->kick(dev, q);



	if (q->queued > q->ndesc - 8 && !q->stopped) {
@@ -327,7 +327,6 @@ mt76_queue_ps_skb(struct mt76_dev *dev, struct ieee80211_sta *sta, 
{

	struct mt76_wcid *wcid = (struct mt76_wcid *) sta->drv_priv;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct mt76_queue *hwq = &dev->q_tx[MT_TXQ_PSD];



	info->control.flags |= IEEE80211_TX_CTRL_PS_RESPONSE;

	if (last)
@@ -335,7 +334,7 @@ mt76_queue_ps_skb(struct mt76_dev *dev, struct ieee80211_sta *sta, 
			       IEEE80211_TX_CTL_REQ_TX_STATUS;



	mt76_skb_set_moredata(skb, !last);

	dev->queue_ops->tx_queue_skb(dev, hwq, skb, wcid, sta);

	dev->queue_ops->tx_queue_skb(dev, MT_TXQ_PSD, skb, wcid, sta);

}



void
@@ -390,6 +389,7 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq, 
		    struct mt76_txq *mtxq, bool *empty)

{

	struct ieee80211_txq *txq = mtxq_to_txq(mtxq);

	enum mt76_txq_id qid = mt76_txq_get_qid(txq);

	struct ieee80211_tx_info *info;

	struct mt76_wcid *wcid = mtxq->wcid;

	struct sk_buff *skb;
@@ -423,7 +423,7 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq, 
	if (ampdu)

		mt76_check_agg_ssn(mtxq, skb);



	idx = dev->queue_ops->tx_queue_skb(dev, hwq, skb, wcid, txq->sta);

	idx = dev->queue_ops->tx_queue_skb(dev, qid, skb, wcid, txq->sta);



	if (idx < 0)

		return idx;
@@ -458,7 +458,7 @@ mt76_txq_send_burst(struct mt76_dev *dev, struct mt76_queue *hwq, 
		if (cur_ampdu)

			mt76_check_agg_ssn(mtxq, skb);



		idx = dev->queue_ops->tx_queue_skb(dev, hwq, skb, wcid,

		idx = dev->queue_ops->tx_queue_skb(dev, qid, skb, wcid,

						   txq->sta);

		if (idx < 0)

			return idx;

CRA Git | Maintained and supported by SUSTech CRA and CCSE