Revert "usbnet: drop unneeded check for NULL"
authorOliver Neukum <oliver@neukum.org>
Wed, 5 Sep 2012 19:22:32 +0000 (21:22 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 5 Sep 2012 20:19:58 +0000 (16:19 -0400)
This reverts commit 5d65878d7031b6c39054b282faceff406bb2fda9.
The upper layers call usbnet_start_xmit() with a valid skb.
However cdc_ncm abuses this method by calling it with NULL
to trigger IO for the aggregated private skb holding erlier
packets. Until cdc_ncm is fixed, the check for NULL must
be reintroduced.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/usbnet.c

index 5234d20ef44dac06ea87803fb66dbe3e6f927b35..8531c1caac283263febc4f674daedef5b7844ff1 100644 (file)
@@ -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