---

yaml --- r: 327813 b: refs/heads/master c: f6fe569 h: refs/heads/master i: 327811: 8effb8f v: v3
git-mirror · Sep 5, 2012 · 854af79 · 854af79
1 parent ab7df54
commit 854af79
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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