mt76usb: allocate urb and sg as linear data

Alloc sg table at the end of urb structure. This will increase
cache usage.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
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 0ae69c2fedafc184cec8974d1cf93ebca230d650..a80d6abee74805758858e05e8f6849e093dca835 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -336,19 +336,19 @@ mt76u_refill_rx(struct mt76_dev *dev, struct urb *urb, int nsgs, gfp_t gfp)
 static int
 mt76u_urb_alloc(struct mt76_dev *dev, struct mt76_queue_entry *e)
 {
-       struct urb *urb;
+       unsigned int size = sizeof(struct urb);
+
+       if (dev->usb.sg_en)
+               size += MT_SG_MAX_SIZE * sizeof(struct scatterlist);
 
-       urb = usb_alloc_urb(0, GFP_KERNEL);
-       if (!urb)
+       e->urb = kzalloc(size, GFP_KERNEL);
+       if (!e->urb)
                return -ENOMEM;
-       e->urb = urb;
 
-       if (dev->usb.sg_en) {
-               urb->sg = devm_kcalloc(dev->dev, MT_SG_MAX_SIZE,
-                                      sizeof(*urb->sg), GFP_KERNEL);
-               if (!urb->sg)
-                       return -ENOMEM;
-       }
+       usb_init_urb(e->urb);
+
+       if (dev->usb.sg_en)
+               e->urb->sg = (struct scatterlist *)(e->urb + 1);
 
        return 0;
 }