mt76: usb: introduce mt76u_fill_bulk_urb routine

Add mt76u_fill_bulk_urb to initialize tx/rx urbs and
remove duplicate code

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.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 7cd95f950ca251efc48718b211ecc0a24087bf5d..fca271abcfc9ab90d10ef785b72cc7b78ee494b3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -376,9 +376,10 @@ void mt76u_buf_free(struct mt76u_buf *buf)
 }
 EXPORT_SYMBOL_GPL(mt76u_buf_free);
 
-int mt76u_submit_buf(struct mt76_dev *dev, int dir, int index,
-                    struct mt76u_buf *buf, gfp_t gfp,
-                    usb_complete_t complete_fn, void *context)
+static void
+mt76u_fill_bulk_urb(struct mt76_dev *dev, int dir, int index,
+                   struct mt76u_buf *buf, usb_complete_t complete_fn,
+                   void *context)
 {
        struct usb_interface *intf = to_usb_interface(dev->dev);
        struct usb_device *udev = interface_to_usbdev(intf);
@@ -392,6 +393,14 @@ int mt76u_submit_buf(struct mt76_dev *dev, int dir, int index,
 
        usb_fill_bulk_urb(buf->urb, udev, pipe, data, buf->len,
                          complete_fn, context);
+}
+
+int mt76u_submit_buf(struct mt76_dev *dev, int dir, int index,
+                    struct mt76u_buf *buf, gfp_t gfp,
+                    usb_complete_t complete_fn, void *context)
+{
+       mt76u_fill_bulk_urb(dev, dir, index, buf, complete_fn,
+                           context);
        trace_submit_urb(dev, buf->urb);
 
        return usb_submit_urb(buf->urb, gfp);
@@ -724,11 +733,16 @@ static void mt76u_complete_tx(struct urb *urb)
 }
 
 static int
-mt76u_tx_build_sg(struct sk_buff *skb, struct urb *urb)
+mt76u_tx_build_sg(struct mt76_dev *dev, struct sk_buff *skb,
+                 struct urb *urb)
 {
-       int nsgs = 1 + skb_shinfo(skb)->nr_frags;
        struct sk_buff *iter;
+       int nsgs;
+
+       if (!dev->usb.sg_en)
+               return 0;
 
+       nsgs = 1 + skb_shinfo(skb)->nr_frags;
        skb_walk_frags(skb, iter)
                nsgs += 1 + skb_shinfo(iter)->nr_frags;
 
@@ -746,12 +760,8 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,
                   struct sk_buff *skb, struct mt76_wcid *wcid,
                   struct ieee80211_sta *sta)
 {
-       struct usb_interface *intf = to_usb_interface(dev->dev);
-       struct usb_device *udev = interface_to_usbdev(intf);
-       u8 *data = NULL, ep = q2ep(q->hw_idx);
        struct mt76u_buf *buf;
        u16 idx = q->tail;
-       unsigned int pipe;
        int err;
 
        if (q->queued == q->ndesc)
@@ -763,19 +773,16 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,
                return err;
 
        buf = &q->entry[idx].ubuf;
+       buf->buf = skb->data;
+       buf->len = skb->len;
        buf->done = false;
 
-       if (dev->usb.sg_en) {
-               err = mt76u_tx_build_sg(skb, buf->urb);
-               if (err < 0)
-                       return err;
-       } else {
-               data = skb->data;
-       }
+       err = mt76u_tx_build_sg(dev, skb, buf->urb);
+       if (err < 0)
+               return err;
 
-       pipe = usb_sndbulkpipe(udev, dev->usb.out_ep[ep]);
-       usb_fill_bulk_urb(buf->urb, udev, pipe, data, skb->len,
-                         mt76u_complete_tx, buf);
+       mt76u_fill_bulk_urb(dev, USB_DIR_OUT, q2ep(q->hw_idx),
+                           buf, mt76u_complete_tx, buf);
 
        q->tail = (q->tail + 1) % q->ndesc;
        q->entry[idx].skb = skb;