Merge "usb: gadget: u_ether: Add skb check in eth_start_xmit" (c786d5a7) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/gadget/function/u_ether.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -490,7 +490,7 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
		}
		spin_unlock_irqrestore(&dev->lock, flags);

		if (!in) {
		if (skb && !in) {
		dev_kfree_skb_any(skb);
		return NETDEV_TX_OK;
		}
		@@ -547,6 +547,7 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
		if (dev->port_usb)
		skb = dev->wrap(dev->port_usb, skb);
		spin_unlock_irqrestore(&dev->lock, flags);
		}
		if (!skb) {
		/* Multi frame CDC protocols may store the frame for
		* later which is not a dropped frame.
		@@ -556,7 +557,6 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
		goto multiframe;
		goto drop;
		}
		}

		length = skb->len;
		req->buf = skb->data;