From 854af79340ac2e61b78b3d52c0eb988d0e67239a Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Wed, 5 Sep 2012 21:22:32 +0200 Subject: [PATCH] --- yaml --- r: 327813 b: refs/heads/master c: f6fe569fe056388166575af1cfaed0bcbc688305 h: refs/heads/master i: 327811: 8effb8f32358f3219637b36a658f6efd2ad8434d v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/usbnet.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 305bd8d5b1c6..a550f3de5de2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d23ff701643a4a725e2c7a8ba2d567d39daa29ea +refs/heads/master: f6fe569fe056388166575af1cfaed0bcbc688305 diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c index 5234d20ef44d..8531c1caac28 100644 --- a/trunk/drivers/net/usb/usbnet.c +++ b/trunk/drivers/net/usb/usbnet.c @@ -1092,7 +1092,8 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, unsigned long flags; int retval; - skb_tx_timestamp(skb); + if (skb) + skb_tx_timestamp(skb); // some devices want funky USB-level framing, for // win32 driver (usually) and/or hardware quirks