diff options
| author | Govindarajulu Varadarajan <_govind@gmx.com> | 2015-01-25 16:09:23 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-26 17:50:11 -0800 |
| commit | db99ad8820f75faa28eac34d8bb5cd72e91554f5 (patch) | |
| tree | cd6905a8c8b24216938e90780ca338bbb4a60b44 /drivers | |
| parent | c4dfc9f37a4cc3d9563639e7daceec0745c85dea (diff) | |
| download | lwn-db99ad8820f75faa28eac34d8bb5cd72e91554f5.tar.gz lwn-db99ad8820f75faa28eac34d8bb5cd72e91554f5.zip | |
bnx2x: fix napi poll return value for repoll
[ Upstream commit 24e579c8898aa641ede3149234906982290934e5 ]
With the commit d75b1ade567ffab ("net: less interrupt masking in NAPI") napi
repoll is done only when work_done == budget. When in busy_poll is we return 0
in napi_poll. We should return budget.
Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index afa4a1f63270..a830d42e3d9b 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -3131,7 +3131,7 @@ static int bnx2x_poll(struct napi_struct *napi, int budget) } #endif if (!bnx2x_fp_lock_napi(fp)) - return work_done; + return budget; for_each_cos_in_tx_queue(fp, cos) if (bnx2x_tx_queue_has_work(fp->txdata_ptr[cos])) |