mt76: mt76u: add mt76_queue to mt76u_refill_rx signature

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>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index 23973ec6c92c5c246229b0f0f1253e6b0b355bb2..65b819f0d18a1753c31b316806047f9e539725e7 100644 (file)
--- 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;
                }