← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to drivers/net/usb/usbnet.c

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings, Ben Hutchings
  • Date: 2012-03-21 03:08:36 UTC
  • mfrom: (1.2.34)
  • Revision ID: package-import@ubuntu.com-20120321030836-rvavg03lkz15wj2q
Tags: 3.3-1~experimental.1
http://bugs.debian.org/663041
* New upstream release: http://kernelnewbies.org/Linux_3.3

[ Ben Hutchings ]
* [x86] crypto: Enable CRYPTO_SERPENT_SSE2_586, CRYPTO_SERPENT_SSE2_X86_64
* aufs: Update to aufs3.x-rcN-20120312
* IB: Enable INFINIBAND_SRPT as module (Closes: #663041)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/usb/usbnet.c
328
328
        unsigned long           lockflags;
329
329
        size_t                  size = dev->rx_urb_size;
330
330
 
331
 
        if ((skb = alloc_skb (size + NET_IP_ALIGN, flags)) == NULL) {
 
331
        skb = __netdev_alloc_skb_ip_align(dev->net, size, flags);
 
332
        if (!skb) {
332
333
                netif_dbg(dev, rx_err, dev->net, "no rx skb\n");
333
334
                usbnet_defer_kevent (dev, EVENT_RX_MEMORY);
334
335
                usb_free_urb (urb);
335
336
                return -ENOMEM;
336
337
        }
337
 
        skb_reserve (skb, NET_IP_ALIGN);
338
338
 
339
339
        entry = (struct skb_data *) skb->cb;
340
340
        entry->urb = urb;
589
589
                entry = (struct skb_data *) skb->cb;
590
590
                urb = entry->urb;
591
591
 
 
592
                spin_unlock_irqrestore(&q->lock, flags);
592
593
                // during some PM-driven resume scenarios,
593
594
                // these (async) unlinks complete immediately
594
595
                retval = usb_unlink_urb (urb);
596
597
                        netdev_dbg(dev->net, "unlink urb err, %d\n", retval);
597
598
                else
598
599
                        count++;
 
600
                spin_lock_irqsave(&q->lock, flags);
599
601
        }
600
602
        spin_unlock_irqrestore (&q->lock, flags);
601
603
        return count;