diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-04-23 20:56:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-24 17:31:27 +0200 |
| commit | e580267df97eda407c525dbaee5430e0d51a0edb (patch) | |
| tree | 0a1bd76568c688f033c6984f06fff738d799176b | |
| parent | tcp: avoid looping in tcp_send_fin() (diff) | |
| download | linux-e580267df97eda407c525dbaee5430e0d51a0edb.tar.xz linux-e580267df97eda407c525dbaee5430e0d51a0edb.zip | |
bgmac: fix requests for extra polling calls from NAPI
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 <zajec5@gmail.com>
Cc: Felix Fietkau <nbd@openwrt.org>
Fixes: eb64e2923a886 ("bgmac: leave interrupts disabled as long as there is work to do")
Acked-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index de77d3a74abc..21e3c38c7c75 100644 --- 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); |