OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ffb5bce
)
net: r6040: Utilize napi_complete_done()
author
Florian Fainelli
<f.fainelli@gmail.com>
Mon, 4 Jul 2016 21:36:07 +0000
(14:36 -0700)
committer
David S. Miller
<davem@davemloft.net>
Tue, 5 Jul 2016 07:10:29 +0000
(
00:10
-0700)
We maintain how much work we did in NAPI context, so provide that with
napi_complete_done().
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/rdc/r6040.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/rdc/r6040.c
b/drivers/net/ethernet/rdc/r6040.c
index
13ff800
..
c0256b8
100644
(file)
--- a/
drivers/net/ethernet/rdc/r6040.c
+++ b/
drivers/net/ethernet/rdc/r6040.c
@@
-648,7
+648,7
@@
static int r6040_poll(struct napi_struct *napi, int budget)
work_done = r6040_rx(dev, budget);
if (work_done < budget) {
- napi_complete
(napi
);
+ napi_complete
_done(napi, work_done
);
/* Enable RX/TX interrupt */
iowrite16(ioread16(ioaddr + MIER) | RX_INTS | TX_INTS,
ioaddr + MIER);