Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e452612a3d5a59a8a7e5f33a579869d49b7ec90b

Authored by Eric Dumazet
Committed by Greg Kroah-Hartman
1 parent eb48900591

netxen: fix netxen_nic_poll() logic 

[ Upstream commit 6088beef3f7517717bd21d90b379714dd0837079 ]

NAPI poll logic now enforces that a poller returns exactly the budget
when it wants to be called again.

If a driver limits TX completion, it has to return budget as well when
the limit is hit, not the number of received packets.

Reported-and-tested-by: Mike Galbraith <umgwanakikbuti@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Fixes: d75b1ade567f ("net: less interrupt masking in NAPI")
Cc: Manish Chopra <manish.chopra@qlogic.com>
Acked-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 4 additions and 1 deletions Side-by-side Diff

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
Diff comments   View file @ e452612
... ... @@ -2388,7 +2388,10 @@
2388 2388  
2389 2389 work_done = netxen_process_rcv_ring(sds_ring, budget);
2390 2390  
2391   - if ((work_done < budget) && tx_complete) {
  2391 + if (!tx_complete)
  2392 + work_done = budget;
  2393 +
  2394 + if (work_done < budget) {
2392 2395 napi_complete(&sds_ring->napi);
2393 2396 if (test_bit(__NX_DEV_UP, &adapter->state))
2394 2397 netxen_nic_enable_int(sds_ring);