Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6fe569f authored by Oliver Neukum's avatar Oliver Neukum Committed by David S. Miller
Browse files

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: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d23ff701

drivers/net/usb/usbnet.c

+2 −1
Original line number Diff line number Diff line
@@ -1092,6 +1092,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, 
	unsigned long		flags;

	int retval;



	if (skb)

		skb_tx_timestamp(skb);



	// some devices want funky USB-level framing, for