diff options
author | David S. Miller <davem@davemloft.net> | 2012-03-18 23:29:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-18 23:29:41 -0400 |
commit | 4da0bd736552e6377b407b3c3d3ae518ebbdd269 (patch) | |
tree | f0da9f843b8033565c3ca4103fccb17a60688326 /drivers/net/usb | |
parent | 81a430ac1b88b0702c57d2513e247317e810e04d (diff) | |
parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/asix.c | 4 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 25fe1838d886..5ee032cafade 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c | |||
@@ -1551,6 +1551,10 @@ static const struct usb_device_id products [] = { | |||
1551 | USB_DEVICE (0x6189, 0x182d), | 1551 | USB_DEVICE (0x6189, 0x182d), |
1552 | .driver_info = (unsigned long) &ax8817x_info, | 1552 | .driver_info = (unsigned long) &ax8817x_info, |
1553 | }, { | 1553 | }, { |
1554 | // Sitecom LN-031 "USB 2.0 10/100/1000 Ethernet adapter" | ||
1555 | USB_DEVICE (0x0df6, 0x0056), | ||
1556 | .driver_info = (unsigned long) &ax88178_info, | ||
1557 | }, { | ||
1554 | // corega FEther USB2-TX | 1558 | // corega FEther USB2-TX |
1555 | USB_DEVICE (0x07aa, 0x0017), | 1559 | USB_DEVICE (0x07aa, 0x0017), |
1556 | .driver_info = (unsigned long) &ax8817x_info, | 1560 | .driver_info = (unsigned long) &ax8817x_info, |
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 5394b4eb00b0..4b8b52ca09d8 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) | |||
328 | unsigned long lockflags; | 328 | unsigned long lockflags; |
329 | size_t size = dev->rx_urb_size; | 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 | netif_dbg(dev, rx_err, dev->net, "no rx skb\n"); | 333 | netif_dbg(dev, rx_err, dev->net, "no rx skb\n"); |
333 | usbnet_defer_kevent (dev, EVENT_RX_MEMORY); | 334 | usbnet_defer_kevent (dev, EVENT_RX_MEMORY); |
334 | usb_free_urb (urb); | 335 | usb_free_urb (urb); |
335 | return -ENOMEM; | 336 | return -ENOMEM; |
336 | } | 337 | } |
337 | skb_reserve (skb, NET_IP_ALIGN); | ||
338 | 338 | ||
339 | entry = (struct skb_data *) skb->cb; | 339 | entry = (struct skb_data *) skb->cb; |
340 | entry->urb = urb; | 340 | entry->urb = urb; |