A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "usb: gadget: NCM: Protect dev->port_usb using dev->lock"

Browse source 
This reverts commit c9ffc78745 as it was
reported to be broken.

Cc: Felipe Balbi <[email protected]>
Cc: Jim Baxter <[email protected]>
Cc: Harish Jenny K N <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Greg Kroah-Hartman 2016-09-19 11:05:43 +02:00
commit 3a383cc0b8
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/usb/gadget/function/u_ether.c
View file

@ -553,16 +553,14 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
spin_lock_irqsave(&dev->lock, flags);
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.
*/
if (dev->port_usb &&
dev->port_usb->supports_multi_frame) {
spin_unlock_irqrestore(&dev->lock, flags);
dev->port_usb->supports_multi_frame)
goto multiframe;
}
spin_unlock_irqrestore(&dev->lock, flags);
goto drop;
}
}
@ -580,7 +578,6 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
req->zero = 0;
else
req->zero = 1;
spin_unlock_irqrestore(&dev->lock, flags);
/* use zlp framing on tx for strict CDC-Ether conformance,
* though any robust network rx path ignores extra padding.