From 5dcce4232fe94dda6e6167bcdf712082ec424ae7 Mon Sep 17 00:00:00 2001 From: Konstantin Khlebnikov Date: Mon, 7 Nov 2011 05:54:58 +0000 Subject: [PATCH] --- yaml --- r: 275085 b: refs/heads/master c: 23ba07991dad5a96a024c1b45cb602eef5f83df8 h: refs/heads/master i: 275083: e8db6c1da32e183082d66a77ffa7dfc2ecdb896d 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 fa321548f65a..45c422471ec5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 012641082b34433dac3cbb452e0a6ceccfd4643f +refs/heads/master: 23ba07991dad5a96a024c1b45cb602eef5f83df8 diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c index 7d6082160bcc..fae0fbd8bc88 100644 --- a/trunk/drivers/net/usb/usbnet.c +++ b/trunk/drivers/net/usb/usbnet.c @@ -1057,7 +1057,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