Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81e850ef authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Kalle Valo
Browse files

mt76x2: add napi struct to mt76_rx_poll_complete/mt76_rx_complete signatures 



in order to reuse mt76_rx_complete routine supporting mt76x2u based
devices add napi struct to mt76_rx_poll_complete and mt76_rx_complete
routine signatures and do not fetch it according to the rx queue index

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d3c94b40

drivers/net/wireless/mediatek/mt76/agg-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ mt76_rx_aggr_reorder_work(struct work_struct *work) 
	if (nframes)

		ieee80211_queue_delayed_work(tid->dev->hw, &tid->reorder_work,

					     REORDER_TIMEOUT);

	mt76_rx_complete(dev, &frames, -1);

	mt76_rx_complete(dev, &frames, NULL);



	rcu_read_unlock();

	local_bh_enable();

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

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ mt76_dma_rx_poll(struct napi_struct *napi, int budget) 


	do {

		cur = mt76_dma_rx_process(dev, &dev->q_rx[qid], budget - done);

		mt76_rx_poll_complete(dev, qid);

		mt76_rx_poll_complete(dev, qid, napi);

		done += cur;

	} while (cur && done < budget);

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

+5 −7
Original line number Diff line number Diff line
@@ -583,15 +583,11 @@ mt76_check_ps(struct mt76_dev *dev, struct sk_buff *skb) 
}



void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames,

		      int queue)

		      struct napi_struct *napi)

{

	struct napi_struct *napi = NULL;

	struct ieee80211_sta *sta;

	struct sk_buff *skb;



	if (queue >= 0)

	    napi = &dev->napi[queue];



	spin_lock(&dev->rx_lock);

	while ((skb = __skb_dequeue(frames)) != NULL) {

		if (mt76_check_ccmp_pn(skb)) {
@@ -605,7 +601,8 @@ void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames, 
	spin_unlock(&dev->rx_lock);

}



void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q)

void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q,

			   struct napi_struct *napi)

{

	struct sk_buff_head frames;

	struct sk_buff *skb;
@@ -617,5 +614,6 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q) 
		mt76_rx_aggr_reorder(skb, &frames);

	}



	mt76_rx_complete(dev, &frames, q);

	mt76_rx_complete(dev, &frames, napi);

}

EXPORT_SYMBOL_GPL(mt76_rx_poll_complete);

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

+3 −2
Original line number Diff line number Diff line
@@ -456,8 +456,9 @@ void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid, 
void mt76_tx_free(struct mt76_dev *dev);

void mt76_put_txwi(struct mt76_dev *dev, struct mt76_txwi_cache *t);

void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames,

		      int queue);

void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q);

		      struct napi_struct *napi);

void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q,

			   struct napi_struct *napi);

void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames);



#endif