| Message ID | 1346872952-21192-1-git-send-email-oliver@neukum.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Oliver Neukum <oliver@neukum.org> Date: Wed, 5 Sep 2012 21:22:32 +0200 > 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> Applied, thanks Oliver. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 5234d20..8531c1c 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, 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
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> --- drivers/net/usb/usbnet.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)