summaryrefslogtreecommitdiff
path: root/drivers/net/usb/usbnet.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-06-05 23:25:01 +0300
committerThomas Gleixner <tglx@linutronix.de>2015-06-05 23:25:01 +0300
commit9f61f62544747db5d5c590bfae9dd19f1337e421 (patch)
tree74772cccd14e7ab6d01a3452d4030cd7f8e58ccb /drivers/net/usb/usbnet.c
parentde8d1810fda5463ee60ba2937ca68e55a52bd9e7 (diff)
parent086e8ddb567951513a5dace21a09297768aee14f (diff)
downloadlinux-9f61f62544747db5d5c590bfae9dd19f1337e421.tar.xz
Merge branch 'linus' into irq/core
Get the urgent fixes from upstream to avoid conflicts.
Diffstat (limited to 'drivers/net/usb/usbnet.c')
-rw-r--r--drivers/net/usb/usbnet.c4
1 files changed, 2 insertions, 2 deletions
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,
struct net_device *net)
{
struct usbnet *dev = netdev_priv(net);
- int length;
+ unsigned int length;
struct urb *urb = NULL;
struct skb_data *entry;
struct driver_info *info = dev->driver_info;
@@ -1413,7 +1413,7 @@ not_drop:
}
} else
netif_dbg(dev, tx_queued, dev->net,
- "> tx, len %d, type 0x%x\n", length, skb->protocol);
+ "> tx, len %u, type 0x%x\n", length, skb->protocol);
#ifdef CONFIG_PM
deferred:
#endif