diff options
| author | Oliver Neukum <oliver@neukum.org> | 2012-09-05 15:22:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-05 16:19:58 -0400 |
| commit | f6fe569fe056388166575af1cfaed0bcbc688305 (patch) | |
| tree | 2e93441f102fdae179f2ec48a6a77a0769c96429 /drivers/net/usb | |
| parent | d23ff701643a4a725e2c7a8ba2d567d39daa29ea (diff) | |
Revert "usbnet: drop unneeded check for NULL"
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>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/usbnet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 5234d20ef44d..8531c1caac28 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
| @@ -1092,7 +1092,8 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, | |||
| 1092 | unsigned long flags; | 1092 | unsigned long flags; |
| 1093 | int retval; | 1093 | int retval; |
| 1094 | 1094 | ||
| 1095 | skb_tx_timestamp(skb); | 1095 | if (skb) |
| 1096 | skb_tx_timestamp(skb); | ||
| 1096 | 1097 | ||
| 1097 | // some devices want funky USB-level framing, for | 1098 | // some devices want funky USB-level framing, for |
| 1098 | // win32 driver (usually) and/or hardware quirks | 1099 | // win32 driver (usually) and/or hardware quirks |