diff options
| author | Konstantin Khlebnikov <khlebnikov@openvz.org> | 2011-11-07 06:54:58 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-07 19:25:41 +0100 |
| commit | 23ba07991dad5a96a024c1b45cb602eef5f83df8 (patch) | |
| tree | 1404d618c42757a234dfb1f0efe946411ecf1b0e /drivers | |
| parent | ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined (diff) | |
| download | linux-23ba07991dad5a96a024c1b45cb602eef5f83df8.tar.xz linux-23ba07991dad5a96a024c1b45cb602eef5f83df8.zip | |
usbnet: fix oops in usbnet_start_xmit
This patch fixes the bug added in commit v3.1-rc7-1055-gf9b491e
SKB can be NULL at this point, at least for cdc-ncm.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -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 7d6082160bcc..fae0fbd8bc88 100644 --- a/drivers/net/usb/usbnet.c +++ b/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 |