Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5de43c1 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Ralf Baechle
Browse files

staging: octeon-ethernet: remove skb alloc failure warnings 



Remove skb allocation failure warnings. They will trigger a page
allocation warning already. Also, one of the warnings was not ratelimited,
causing the box to lock up under heavy traffic & low memory.

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


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent da029d0c

drivers/staging/octeon/ethernet-mem.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -48,13 +48,8 @@ static int cvm_oct_fill_hw_skbuff(int pool, int size, int elements) 
	while (freed) {

	while (freed) {





		struct sk_buff *skb = dev_alloc_skb(size + 256);

		struct sk_buff *skb = dev_alloc_skb(size + 256);

		if (unlikely(skb == NULL)) {

		if (unlikely(skb == NULL))

			pr_warning

			    ("Failed to allocate skb for hardware pool %d\n",

			     pool);

			break;

			break;

		}



		skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f));

		skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f));

		*(struct sk_buff **)(skb->data - sizeof(void *)) = skb;

		*(struct sk_buff **)(skb->data - sizeof(void *)) = skb;

		cvmx_fpa_free(skb->data, pool, DONT_WRITEBACK(size / 128));

		cvmx_fpa_free(skb->data, pool, DONT_WRITEBACK(size / 128));

drivers/staging/octeon/ethernet-rx.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -337,9 +337,6 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) 
			 */

			 */

			skb = dev_alloc_skb(work->len);

			skb = dev_alloc_skb(work->len);

			if (!skb) {

			if (!skb) {

				printk_ratelimited("Port %d failed to allocate "

						   "skbuff, packet dropped\n",

						   work->ipprt);

				cvm_oct_free_work(work);

				cvm_oct_free_work(work);

				continue;

				continue;

			}

			}