diff options
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/r8152.c | 1 | ||||
| -rw-r--r-- | drivers/net/usb/usbnet.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index ac4d03b328b1..aafa1a1898e4 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c | |||
| @@ -4116,6 +4116,7 @@ static struct usb_device_id rtl8152_table[] = { | |||
| 4116 | {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)}, | 4116 | {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)}, |
| 4117 | {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)}, | 4117 | {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)}, |
| 4118 | {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7205)}, | 4118 | {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7205)}, |
| 4119 | {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)}, | ||
| 4119 | {} | 4120 | {} |
| 4120 | }; | 4121 | }; |
| 4121 | 4122 | ||
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 733f4feb2ef3..3c86b107275a 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
| @@ -1285,7 +1285,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, | |||
| 1285 | struct net_device *net) | 1285 | struct net_device *net) |
| 1286 | { | 1286 | { |
| 1287 | struct usbnet *dev = netdev_priv(net); | 1287 | struct usbnet *dev = netdev_priv(net); |
| 1288 | int length; | 1288 | unsigned int length; |
| 1289 | struct urb *urb = NULL; | 1289 | struct urb *urb = NULL; |
| 1290 | struct skb_data *entry; | 1290 | struct skb_data *entry; |
| 1291 | struct driver_info *info = dev->driver_info; | 1291 | struct driver_info *info = dev->driver_info; |
| @@ -1413,7 +1413,7 @@ not_drop: | |||
| 1413 | } | 1413 | } |
| 1414 | } else | 1414 | } else |
| 1415 | netif_dbg(dev, tx_queued, dev->net, | 1415 | netif_dbg(dev, tx_queued, dev->net, |
| 1416 | "> tx, len %d, type 0x%x\n", length, skb->protocol); | 1416 | "> tx, len %u, type 0x%x\n", length, skb->protocol); |
| 1417 | #ifdef CONFIG_PM | 1417 | #ifdef CONFIG_PM |
| 1418 | deferred: | 1418 | deferred: |
| 1419 | #endif | 1419 | #endif |
