diff options
| author | Praneeth Bajjuri <praneeth@ti.com> | 2015-01-22 16:38:56 -0600 |
|---|---|---|
| committer | Badhri Jagan Sridharan <badhri@google.com> | 2015-01-23 21:55:37 +0000 |
| commit | 31887725d26b70089ca659c45775ea3215c6a194 (patch) | |
| tree | 328c20f4a5c3430146124d29912e99f1bbde2c56 | |
| parent | 58b71519197098ca993417fedb4dd42e70d8fa3f (diff) | |
usb: u_ether: Fix compile errors
commit f1a1823ff24fa4e3412b5078f20021cf40834946
usb: gadget: u_ether: convert into module
changes qlen function definition. and this has to be fixed
accordingly in current u_ether driver.
This patch fixes following compile error in u_ether caused by commit.
drivers/usb/gadget/u_ether.c: In function 'rx_fill':
drivers/usb/gadget/u_ether.c:416:3: error: too few arguments to function 'qlen'
if (++req_cnt > qlen(dev->gadget))
^
drivers/usb/gadget/u_ether.c: In function 'eth_start_xmit':
drivers/usb/gadget/u_ether.c:738:24: error: 'qmult' undeclared (first use in this function)
if (dev->tx_qlen == (qmult/2)) {
which was caused by commits
commit 79467317949e1621240f632acfb7453783bec2e7
USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode
commit 68b91e8c54f5c091986c5719631893b10eab760a
usb: u_ether: Add workqueue as bottom half handler for rx data path
Change-Id: Ic4e5a1e08cb688e5a606c7c1895f869d8f887b9f
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
| -rw-r--r-- | drivers/usb/gadget/u_ether.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c index c87982baa9ab..28b291a4e0e5 100644 --- a/drivers/usb/gadget/u_ether.c +++ b/drivers/usb/gadget/u_ether.c @@ -413,7 +413,7 @@ static void rx_fill(struct eth_dev *dev, gfp_t gfp_flags) spin_lock_irqsave(&dev->req_lock, flags); while (!list_empty(&dev->rx_reqs)) { /* break the nexus of continuous completion and re-submission*/ - if (++req_cnt > qlen(dev->gadget)) + if (++req_cnt > qlen(dev->gadget, dev->qmult)) break; req = container_of(dev->rx_reqs.next, @@ -735,7 +735,7 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb, if (gadget_is_dualspeed(dev->gadget) && (dev->gadget->speed == USB_SPEED_HIGH)) { dev->tx_qlen++; - if (dev->tx_qlen == (qmult/2)) { + if (dev->tx_qlen == (dev->qmult/2)) { req->no_interrupt = 0; dev->tx_qlen = 0; } else { |