diff options
author | Govindarajulu Varadarajan <_govind@gmx.com> | 2014-11-12 17:42:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-12 22:18:14 -0500 |
commit | f41281d02f8b94e136f78cb1b6a5d78182c222bd (patch) | |
tree | 1792107b257eddccda037069e6d296b25af6e1c4 /drivers/net/ethernet | |
parent | a768851f94dbf74d07b1a86af732f142753f4071 (diff) |
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 <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) | |||
1312 | if (!wq_work_done) { | 1312 | if (!wq_work_done) { |
1313 | napi_complete(napi); | 1313 | napi_complete(napi); |
1314 | vnic_intr_unmask(&enic->intr[intr]); | 1314 | vnic_intr_unmask(&enic->intr[intr]); |
1315 | return 0; | ||
1315 | } | 1316 | } |
1316 | 1317 | ||
1317 | return 0; | 1318 | return budget; |
1318 | } | 1319 | } |
1319 | 1320 | ||
1320 | static int enic_poll_msix_rq(struct napi_struct *napi, int budget) | 1321 | static int enic_poll_msix_rq(struct napi_struct *napi, int budget) |