Commit da029d0c authored Sep 05, 2013 by Aaro Koskinen Committed by Ralf Baechle Sep 17, 2013

staging: octeon-ethernet: make dropped packets to consume NAPI budget

We should count also dropped packets, otherwise the NAPI handler may
end up running too long.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: devel@driverdev.osuosl.org
Cc: linux-mips@linux-mips.org
Cc: David Daney <david.daney@cavium.com>
Cc: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: richard@nod.at
Patchwork: https://patchwork.linux-mips.org/patch/5809/

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 272b98c6

drivers/staging/octeon/ethernet-rx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -303,6 +303,7 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
		if (backlog > budget * cores_in_use && napi != NULL)
		cvm_oct_enable_one_cpu();
		}
		rx_count++;

		skb_in_hw = USE_SKBUFFS_IN_HW && work->word2.s.bufs == 1;
		if (likely(skb_in_hw)) {
		@@ -429,7 +430,6 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
		#endif
		}
		netif_receive_skb(skb);
		rx_count++;
		} else {
		/* Drop any packet received for a device that isn't up */
		/*