aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/cisco/enic/enic_main.c
diff options
context:
space:
mode:
authorGovindarajulu Varadarajan <_govind@gmx.com>2015-01-20 18:46:15 +0530
committerDavid S. Miller <davem@davemloft.net>2015-01-24 22:39:03 -0800
commitf104fedc0da126abe93dd0f4a9fa13e5133bf9df (patch)
tree5497a8c5608f9dc6c7a23344c5a190fc877ef550 /drivers/net/ethernet/cisco/enic/enic_main.c
parentMerge tag 'wireless-drivers-for-davem-2015-01-20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers (diff)
downloadlinux-dev-f104fedc0da126abe93dd0f4a9fa13e5133bf9df.tar.xz
linux-dev-f104fedc0da126abe93dd0f4a9fa13e5133bf9df.zip
enic: fix rx napi poll return value
With the commit d75b1ade567ffab ("net: less interrupt masking in NAPI") napi repoll is done only when work_done == budget. When we are in busy_poll we return 0 in napi_poll. We should return budget. Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/net/ethernet/cisco/enic/enic_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index b29e027c476e..e356afa44e7d 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -1335,7 +1335,7 @@ static int enic_poll_msix_rq(struct napi_struct *napi, int budget)
int err;
if (!enic_poll_lock_napi(&enic->rq[rq]))
- return work_done;
+ return budget;
/* Service RQ
*/