leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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 <felipe.balbi@linux.intel.com>
Cc: Jim Baxter <jim_baxter@mentor.com>
Cc: Harish Jenny K N <harish_kandiga@mentor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2016-09-19 11:05:43 +02:00
parent c51f2ff007
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); spin_lock_irqsave(&dev->lock, flags);
if (dev->port_usb) if (dev->port_usb)
skb = dev->wrap(dev->port_usb, skb); skb = dev->wrap(dev->port_usb, skb);
spin_unlock_irqrestore(&dev->lock, flags);
if (!skb) { if (!skb) {
/* Multi frame CDC protocols may store the frame for /* Multi frame CDC protocols may store the frame for
* later which is not a dropped frame. * later which is not a dropped frame.
*/ */
if (dev->port_usb && if (dev->port_usb &&
dev->port_usb->supports_multi_frame) { dev->port_usb->supports_multi_frame)
spin_unlock_irqrestore(&dev->lock, flags);
goto multiframe; goto multiframe;
}
spin_unlock_irqrestore(&dev->lock, flags);
goto drop; goto drop;
} }
} }
@@ -580,7 +578,6 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
req->zero = 0; req->zero = 0;
else else
req->zero = 1; req->zero = 1;
spin_unlock_irqrestore(&dev->lock, flags);
/* use zlp framing on tx for strict CDC-Ether conformance, /* use zlp framing on tx for strict CDC-Ether conformance,
* though any robust network rx path ignores extra padding. * though any robust network rx path ignores extra padding.