From: Govindarajulu Varadarajan <_govind@gmx.com> Date: Wed, 12 Nov 2014 22:42:06 +0000 (+0530) Subject: enic: fix work done in tx napi_poll X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f41281d02f8b94e136f78cb1b6a5d78182c222bd;p=openwrt%2Fstaging%2Fblogic.git enic: fix work done in tx napi_poll With the commit d75b1ade567 ("net: less interrupt masking in NAPI") napi repoll is done only when work_done == budget. In tx napi poll we always return 0. So tx napi is not called again and we do not clean up the tx ring. Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 73cf1653a4a3..5afe360c7e89 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -1312,9 +1312,10 @@ static int enic_poll_msix_wq(struct napi_struct *napi, int budget) if (!wq_work_done) { napi_complete(napi); vnic_intr_unmask(&enic->intr[intr]); + return 0; } - return 0; + return budget; } static int enic_poll_msix_rq(struct napi_struct *napi, int budget)