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

mt76: remove struct mt76_sw_queue 



All members except for the struct mt76_queue pointer have been removed

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

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ int mt76_queues_read(struct seq_file *s, void *data) 
	int i;



	for (i = 0; i < ARRAY_SIZE(dev->q_tx); i++) {

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

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



		if (!q)

			continue;

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

+3 −4
Original line number Diff line number Diff line
@@ -150,8 +150,7 @@ mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q) 
static void

mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush)

{

	struct mt76_sw_queue *sq = &dev->q_tx[qid];

	struct mt76_queue *q = sq->q;

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

	struct mt76_queue_entry entry;

	bool wake = false;

	int last;
@@ -249,7 +248,7 @@ static int 
mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid,

			  struct sk_buff *skb, u32 tx_info)

{

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

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

	struct mt76_queue_buf buf;

	dma_addr_t addr;
@@ -281,7 +280,7 @@ 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].q;

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

	struct mt76_tx_info tx_info = {

		.skb = skb,

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ bool mt76_has_tx_pending(struct mt76_phy *phy) 
	offset = __MT_TXQ_MAX * (phy != &dev->phy);



	for (i = 0; i < __MT_TXQ_MAX; i++) {

		q = dev->q_tx[offset + i].q;

		q = dev->q_tx[offset + i];

		if (q && q->queued)

			return true;

	}

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

+2 −6
Original line number Diff line number Diff line
@@ -139,10 +139,6 @@ struct mt76_queue { 
	struct page_frag_cache rx_page;

};



struct mt76_sw_queue {

	struct mt76_queue *q;

};



struct mt76_mcu_ops {

	u32 headroom;

	u32 tailroom;
@@ -229,7 +225,7 @@ struct mt76_wcid { 
};



struct mt76_txq {

	struct mt76_sw_queue *swq;

	struct mt76_queue *q;

	struct mt76_wcid *wcid;



	struct sk_buff_head retry_q;
@@ -604,7 +600,7 @@ struct mt76_dev { 
	struct sk_buff_head rx_skb[__MT_RXQ_MAX];



	struct list_head txwi_cache;

	struct mt76_sw_queue q_tx[2 * __MT_TXQ_MAX];

	struct mt76_queue *q_tx[2 * __MT_TXQ_MAX];

	struct mt76_queue q_rx[__MT_RXQ_MAX];

	const struct mt76_queue_ops *queue_ops;

	int tx_dma_idx[4];

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

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ mt7603_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif) 
	mt76_wr(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY |

		FIELD_PREP(MT_DMA_FQCR0_TARGET_WCID, mvif->sta.wcid.idx) |

		FIELD_PREP(MT_DMA_FQCR0_TARGET_QID,

			   dev->mt76.q_tx[MT_TXQ_CAB].q->hw_idx) |

			   dev->mt76.q_tx[MT_TXQ_CAB]->hw_idx) |

		FIELD_PREP(MT_DMA_FQCR0_DEST_PORT_ID, 3) |

		FIELD_PREP(MT_DMA_FQCR0_DEST_QUEUE_ID, 8));
@@ -78,7 +78,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg) 
	data.dev = dev;

	__skb_queue_head_init(&data.q);



	q = dev->mt76.q_tx[MT_TXQ_BEACON].q;

	q = dev->mt76.q_tx[MT_TXQ_BEACON];

	spin_lock_bh(&q->lock);

	ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),

		IEEE80211_IFACE_ITER_RESUME_ALL,
@@ -95,7 +95,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg) 
	if (dev->mt76.csa_complete)

		goto out;



	q = dev->mt76.q_tx[MT_TXQ_CAB].q;

	q = dev->mt76.q_tx[MT_TXQ_CAB];

	do {

		nframes = skb_queue_len(&data.q);

		ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),
@@ -136,7 +136,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg) 


out:

	mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false);

	if (dev->mt76.q_tx[MT_TXQ_BEACON].q->queued >

	if (dev->mt76.q_tx[MT_TXQ_BEACON]->queued >

	    hweight8(dev->mt76.beacon_mask))

		dev->beacon_check++;

}