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

mt76: dma: add static qualifier to mt76_dma_tx_queue_skb 



As already done for mt76_dma_tx_queue_skb_raw, add static qualifier to
mt76_dma_tx_queue_skb and introduce mt76_tx_queue_skb in order to run
mt76_dma_tx_queue_skb in driver code

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

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

+4 −4
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ 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, enum mt76_txq_id qid,

static 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)

{
@@ -353,7 +354,6 @@ free: 
	mt76_put_txwi(dev, t);

	return ret;

}

EXPORT_SYMBOL_GPL(mt76_dma_tx_queue_skb);



static int

mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q)

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

+1 −4
Original line number Diff line number Diff line
@@ -587,6 +587,7 @@ static inline u16 mt76_rev(struct mt76_dev *dev) 
#define mt76_init_queues(dev)		(dev)->mt76.queue_ops->init(&((dev)->mt76))

#define mt76_queue_alloc(dev, ...)	(dev)->mt76.queue_ops->alloc(&((dev)->mt76), __VA_ARGS__)

#define mt76_tx_queue_skb_raw(dev, ...)	(dev)->mt76.queue_ops->tx_queue_skb_raw(&((dev)->mt76), __VA_ARGS__)

#define mt76_tx_queue_skb(dev, ...)	(dev)->mt76.queue_ops->tx_queue_skb(&((dev)->mt76), __VA_ARGS__)

#define mt76_queue_rx_reset(dev, ...)	(dev)->mt76.queue_ops->rx_reset(&((dev)->mt76), __VA_ARGS__)

#define mt76_queue_tx_cleanup(dev, ...)	(dev)->mt76.queue_ops->tx_cleanup(&((dev)->mt76), __VA_ARGS__)

#define mt76_queue_kick(dev, ...)	(dev)->mt76.queue_ops->kick(&((dev)->mt76), __VA_ARGS__)
@@ -660,10 +661,6 @@ 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, enum mt76_txq_id qid,

			  struct sk_buff *skb, struct mt76_wcid *wcid,

			  struct ieee80211_sta *sta);



static inline void mt76_insert_hdr_pad(struct sk_buff *skb)

{

	int len = ieee80211_get_hdrlen_from_skb(skb);

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

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

		return;



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

			      &mvif->sta.wcid, NULL);

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



	spin_lock_bh(&dev->ps_lock);

	mt76_wr(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY |
@@ -118,8 +117,7 @@ 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, MT_TXQ_CAB, skb,

				      &mvif->sta.wcid, NULL);

		mt76_tx_queue_skb(dev, 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, MT_TXQ_PSD, skb,

				      &mvif->group_wcid, NULL);

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

				  NULL);

	}

	spin_unlock_bh(&q->lock);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE