From: Lorenzo Bianconi <lorenzo@kernel.org>
To: nbd@nbd.name
Cc: lorenzo.bianconi@redhat.com, linux-wireless@vger.kernel.org,
Sean.Wang@mediatek.com
Subject: [PATCH v3 04/18] mt76: mt76u: add mt76_queue to mt76u_refill_rx signature
Date: Wed, 15 Jan 2020 11:58:44 +0100 [thread overview]
Message-ID: <35cd2d7a1e1042e0cd3fb8b83d2945aa5ee79a76.1579085367.git.lorenzo@kernel.org> (raw)
In-Reply-To: <cover.1579085367.git.lorenzo@kernel.org>
Introduce mt76_queue parameter to mt76u_refill_rx signature in order to
reuse it for mcu hw rx queue
Co-developed-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/usb.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index 23973ec6c92c..65b819f0d18a 100644
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -318,11 +318,12 @@ mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76_queue *q, struct urb *urb,
}
static int
-mt76u_refill_rx(struct mt76_dev *dev, struct urb *urb, int nsgs, gfp_t gfp)
+mt76u_refill_rx(struct mt76_dev *dev, struct mt76_queue *q,
+ struct urb *urb, int nsgs, gfp_t gfp)
{
- struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];
+ enum mt76_rxq_id qid = q - &dev->q_rx[MT_RXQ_MAIN];
- if (dev->usb.sg_en)
+ if (qid == MT_RXQ_MAIN && dev->usb.sg_en)
return mt76u_fill_rx_sg(dev, q, urb, nsgs, gfp);
urb->transfer_buffer_length = q->buf_size;
@@ -355,13 +356,14 @@ mt76u_urb_alloc(struct mt76_dev *dev, struct mt76_queue_entry *e,
static int
mt76u_rx_urb_alloc(struct mt76_dev *dev, struct mt76_queue_entry *e)
{
+ struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];
int err;
err = mt76u_urb_alloc(dev, e, MT_RX_SG_MAX_SIZE);
if (err)
return err;
- return mt76u_refill_rx(dev, e->urb, MT_RX_SG_MAX_SIZE,
+ return mt76u_refill_rx(dev, q, e->urb, MT_RX_SG_MAX_SIZE,
GFP_KERNEL);
}
@@ -558,7 +560,7 @@ mt76u_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
count = mt76u_process_rx_entry(dev, urb, q->buf_size);
if (count > 0) {
- err = mt76u_refill_rx(dev, urb, count, GFP_ATOMIC);
+ err = mt76u_refill_rx(dev, q, urb, count, GFP_ATOMIC);
if (err < 0)
break;
}
--
2.21.1
next prev parent reply other threads:[~2020-01-15 10:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 10:58 [PATCH v3 00/18] rework mt76u layer to support new devices Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 01/18] mt76: mt76u: check tx_status_data pointer in mt76u_tx_tasklet Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 02/18] mt76: mt76u: add mt76u_process_rx_queue utility routine Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 03/18] mt76: mt76u: add mt76_queue to mt76u_get_next_rx_entry signature Lorenzo Bianconi
2020-01-15 10:58 ` Lorenzo Bianconi [this message]
2020-01-15 10:58 ` [PATCH v3 05/18] mt76: mt76u: use mt76_queue as mt76u_complete_rx context Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 06/18] mt76: mt76u: add queue id parameter to mt76u_submit_rx_buffers Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 07/18] mt76: mt76u: move mcu buffer allocation in mt76x02u drivers Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 08/18] mt76: mt76u: introduce mt76u_free_rx_queue utility routine Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 09/18] mt76: mt76u: stop/free all possible rx queues Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 10/18] mt76: mt76u: add mt76u_alloc_rx_queue utility routine Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 11/18] mt76: mt76u: add queue parameter to mt76u_rx_urb_alloc Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 12/18] mt76: mt76u: resume all rx queue in mt76u_resume_rx Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 13/18] mt76: mt76u: introduce mt76u_alloc_mcu_queue utility routine Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 14/18] mt76: mt76u: add {read/write}_extended utility routines Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 15/18] mt76: mt76u: take into account different queue mapping for 7663 Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 16/18] mt76: mt76u: introduce mt76u_skb_dma_info routine Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 17/18] mt76: mt76u: add endpoint to mt76u_bulk_msg signature Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 18/18] mt76: mt76u: introduce MT_DRV_RX_DMA_HDR flag Lorenzo Bianconi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=35cd2d7a1e1042e0cd3fb8b83d2945aa5ee79a76.1579085367.git.lorenzo@kernel.org \
--to=lorenzo@kernel.org \
--cc=Sean.Wang@mediatek.com \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=nbd@nbd.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).