projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp'
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bgmac.c
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);