---

yaml --- r: 275085 b: refs/heads/master c: 23ba079 h: refs/heads/master i: 275083: e8db6c1 v: v3
git-mirror · Nov 7, 2011 · 5dcce42 · 5dcce42
1 parent c74c9f9
commit 5dcce42
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: 012641082b34433dac3cbb452e0a6ceccfd4643f
+refs/heads/master: 23ba07991dad5a96a024c1b45cb602eef5f83df8
diff --git 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