From 64055dcd72c9b5f183d7c4b4aa0a70cdd6895432 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Tue, 4 Sep 2012 04:21:54 +0000
Subject: [PATCH] --- yaml --- r: 327800 b: refs/heads/master c:
 6e129d04de7adbd63e86293533688ce88b9b13d8 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/usb/usbnet.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 211eafb8a0ca..90d253831f13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e9f0207d3e63fab7a0f8a0e532bdc73ea850baf
+refs/heads/master: 6e129d04de7adbd63e86293533688ce88b9b13d8
diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c
index 8531c1caac28..5234d20ef44d 100644
--- a/trunk/drivers/net/usb/usbnet.c
+++ b/trunk/drivers/net/usb/usbnet.c
@@ -1092,8 +1092,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
 	unsigned long		flags;
 	int retval;
 
-	if (skb)
-		skb_tx_timestamp(skb);
+	skb_tx_timestamp(skb);
 
 	// some devices want funky USB-level framing, for
 	// win32 driver (usually) and/or hardware quirks