diff options
| author |   Govindarajulu Varadarajan <_govind@gmx.com> | 2015-01-25 16:09:23 +0530 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-01-27 00:29:29 -0800 |
| commit | 24e579c8898aa641ede3149234906982290934e5 (patch) | |
| tree | 43dc9c578a08e2a5b0def1da028fa32950b36406 | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec (diff) | |
| download | linux-dev-24e579c8898aa641ede3149234906982290934e5.tar.xz linux-dev-24e579c8898aa641ede3149234906982290934e5.zip | |
bnx2x: fix napi poll return value for repoll
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>
| -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 1d1147c93d59..e468ed3f210f 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -3175,7 +3175,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])) |