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

mt76: remove mt76_queue dependency from tx_prepare_skb function pointer 



Remove mt76_queue dependency from tx_prepare_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 89a37842

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

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ int mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, 
	skb->prev = skb->next = NULL;

	dma_sync_single_for_cpu(dev->dev, t->dma_addr, sizeof(t->txwi),

				DMA_TO_DEVICE);

	ret = dev->drv->tx_prepare_skb(dev, &t->txwi, skb, q, wcid, sta,

	ret = dev->drv->tx_prepare_skb(dev, &t->txwi, skb, qid, wcid, sta,

				       &tx_info);

	dma_sync_single_for_device(dev->dev, t->dma_addr, sizeof(t->txwi),

				   DMA_TO_DEVICE);

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

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ struct mt76_driver_ops { 
	void (*update_survey)(struct mt76_dev *dev);



	int (*tx_prepare_skb)(struct mt76_dev *dev, void *txwi_ptr,

			      struct sk_buff *skb, struct mt76_queue *q,

			      struct sk_buff *skb, enum mt76_txq_id qid,

			      struct mt76_wcid *wcid,

			      struct ieee80211_sta *sta, u32 *tx_info);

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

+6 −5
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ int mt7603_wtbl_set_key(struct mt7603_dev *dev, int wcid, 


static int

mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,

		      struct sk_buff *skb, struct mt76_queue *q,

		      struct sk_buff *skb, enum mt76_txq_id qid,

		      struct mt76_wcid *wcid, struct ieee80211_sta *sta,

		      int pid, struct ieee80211_key_conf *key)

{
@@ -792,6 +792,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi, 
	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ieee80211_bar *bar = (struct ieee80211_bar *)skb->data;

	struct ieee80211_vif *vif = info->control.vif;

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

	struct mt7603_vif *mvif;

	int wlan_idx;

	int hdr_len = ieee80211_get_hdrlen_from_skb(skb);
@@ -806,7 +807,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi, 
	if (vif) {

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

		vif_idx = mvif->idx;

		if (vif_idx && q >= &dev->mt76.q_tx[MT_TXQ_BEACON])

		if (vif_idx && qid >= MT_TXQ_BEACON)

			vif_idx += 0x10;

	}
@@ -880,7 +881,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi, 
	}



	/* use maximum tx count for beacons and buffered multicast */

	if (q >= &dev->mt76.q_tx[MT_TXQ_BEACON])

	if (qid >= MT_TXQ_BEACON)

		tx_count = 0x1f;



	val = FIELD_PREP(MT_TXD3_REM_TX_COUNT, tx_count) |
@@ -911,7 +912,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi, 
}



int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,

			  struct sk_buff *skb, struct mt76_queue *q,

			  struct sk_buff *skb, enum mt76_txq_id qid,

			  struct mt76_wcid *wcid, struct ieee80211_sta *sta,

			  u32 *tx_info)

{
@@ -943,7 +944,7 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 
		spin_unlock_bh(&dev->mt76.lock);

	}



	mt7603_mac_write_txwi(dev, txwi_ptr, skb, q, wcid, sta, pid, key);

	mt7603_mac_write_txwi(dev, txwi_ptr, skb, qid, wcid, sta, pid, key);



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void mt7603_wtbl_set_smps(struct mt7603_dev *dev, struct mt7603_sta *sta, 
void mt7603_filter_tx(struct mt7603_dev *dev, int idx, bool abort);



int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,

			  struct sk_buff *skb, struct mt76_queue *q,

			  struct sk_buff *skb, enum mt76_txq_id qid,

			  struct mt76_wcid *wcid, struct ieee80211_sta *sta,

			  u32 *tx_info);

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

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance); 
void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,

		struct sk_buff *skb);

int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,

			   struct sk_buff *skb, struct mt76_queue *q,

			   struct sk_buff *skb, enum mt76_txq_id qid,

			   struct mt76_wcid *wcid, struct ieee80211_sta *sta,

			   u32 *tx_info);

void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

CRA Git | Maintained and supported by SUSTech CRA and CCSE