1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index fae0fbd8bc88..59681f01a54e 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -328,13 +328,13 @@ static int rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
         unsigned long           lockflags;
         size_t                  size = dev->rx_urb_size;
 
-        if ((skb = alloc_skb (size + NET_IP_ALIGN, flags)) == NULL) {
+        skb = __netdev_alloc_skb_ip_align(dev->net, size, flags);
+        if (!skb) {
                 netif_dbg(dev, rx_err, dev->net, "no rx skb\n");
                 usbnet_defer_kevent (dev, EVENT_RX_MEMORY);
                 usb_free_urb (urb);
                 return -ENOMEM;
         }
-        skb_reserve (skb, NET_IP_ALIGN);
 
         entry = (struct skb_data *) skb->cb;
         entry->urb = urb;
@@ -589,6 +589,7 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
                 entry = (struct skb_data *) skb->cb;
                 urb = entry->urb;
 
+                spin_unlock_irqrestore(&q->lock, flags);
                 // during some PM-driven resume scenarios,
                 // these (async) unlinks complete immediately
                 retval = usb_unlink_urb (urb);
@@ -596,6 +597,7 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
                         netdev_dbg(dev->net, "unlink urb err, %d\n", retval);
                 else
                         count++;
+                spin_lock_irqsave(&q->lock, flags);
         }
         spin_unlock_irqrestore (&q->lock, flags);
         return count;