projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
845704a
)
bgmac: fix requests for extra polling calls from NAPI
author
Rafał Miłecki
<
[email protected]
>
Thu, 23 Apr 2015 18:56:29 +0000
(20:56 +0200)
committer
David S. Miller
<
[email protected]
>
Fri, 24 Apr 2015 15:31:27 +0000
(11:31 -0400)
After
d75b1ade567f
("net: less interrupt masking in NAPI") polling
function has to return whole budget when it wants NAPI to call it again.
Signed-off-by: Rafał Miłecki <
[email protected]
>
Cc: Felix Fietkau <
[email protected]
>
Fixes: eb64e2923a886 ("bgmac: leave interrupts disabled as long as there is work to do")
Acked-by: Felix Fietkau <
[email protected]
>
Signed-off-by: Eric Dumazet <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/broadcom/bgmac.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/broadcom/bgmac.c
b/drivers/net/ethernet/broadcom/bgmac.c
index de77d3a74abc82f0c8b77dff3200799e70634674..21e3c38c7c752dd75674a62aeb8211bc78477808 100644
(file)
--- a/
drivers/net/ethernet/broadcom/bgmac.c
+++ b/
drivers/net/ethernet/broadcom/bgmac.c
@@
-1260,7
+1260,7
@@
static int bgmac_poll(struct napi_struct *napi, int weight)
/* Poll again if more events arrived in the meantime */
if (bgmac_read(bgmac, BGMAC_INT_STATUS) & (BGMAC_IS_TX0 | BGMAC_IS_RX))
- return
handled
;
+ return
weight
;
if (handled < weight) {
napi_complete(napi);