diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-19 15:26:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-19 15:26:42 +0200 |
| commit | 733cbe069835d081c9e4bbfabb25597da472359c (patch) | |
| tree | 500f58c3f0d52f06191b4b9835a949a2d137375b /drivers/usb/gadget/function/u_ether.c | |
| parent | a19b882c07a63174f09d1f7c036cc2aab7f04ad3 (diff) | |
| parent | a1aa8cf6471b17c0fa7132ea5eeef0ae07ca07cd (diff) | |
| download | linux-733cbe069835d081c9e4bbfabb25597da472359c.tar.gz linux-733cbe069835d081c9e4bbfabb25597da472359c.tar.bz2 linux-733cbe069835d081c9e4bbfabb25597da472359c.zip | |
Merge tag 'fixes-for-v4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v4.9-rc2
First set of fixes for v4.9-rc cycle. Nothing major
this time around. The most important patches are the
3 fixes in dwc3 (dma_free_coheren() size fix,
queued request accounting fix and Isochronous
StartTransfer fix) and the 3 reverts on dwc2.
We're also including the late atmel UDC fix which
didn't make it into v4.8-final.
Diffstat (limited to 'drivers/usb/gadget/function/u_ether.c')
| -rw-r--r-- | drivers/usb/gadget/function/u_ether.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c index 9c8c9ed1dc9e..fe1811650dbc 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -590,8 +590,9 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb, /* throttle high/super speed IRQ rate back slightly */ if (gadget_is_dualspeed(dev->gadget)) - req->no_interrupt = (dev->gadget->speed == USB_SPEED_HIGH || - dev->gadget->speed == USB_SPEED_SUPER) + req->no_interrupt = (((dev->gadget->speed == USB_SPEED_HIGH || + dev->gadget->speed == USB_SPEED_SUPER)) && + !list_empty(&dev->tx_reqs)) ? ((atomic_read(&dev->tx_qlen) % dev->qmult) != 0) : 0; |