Skip to content

Commit c35656d

Browse files
aakoskingregkh
authored andcommitted
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: Aaro Koskinen <[email protected]> Acked-by: David Daney <[email protected]> Acked-by: Jason A. Donenfeld <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ed12cd6 commit c35656d

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

drivers/staging/octeon/ethernet-mem.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,8 @@ static int cvm_oct_fill_hw_skbuff(int pool, int size, int elements)
4848
while (freed) {
4949

5050
struct sk_buff *skb = dev_alloc_skb(size + 256);
51-
if (unlikely(skb == NULL)) {
52-
pr_warning
53-
("Failed to allocate skb for hardware pool %d\n",
54-
pool);
51+
if (unlikely(skb == NULL))
5552
break;
56-
}
57-
5853
skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f));
5954
*(struct sk_buff **)(skb->data - sizeof(void *)) = skb;
6055
cvmx_fpa_free(skb->data, pool, DONT_WRITEBACK(size / 128));

drivers/staging/octeon/ethernet-rx.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,6 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
337337
*/
338338
skb = dev_alloc_skb(work->len);
339339
if (!skb) {
340-
printk_ratelimited("Port %d failed to allocate "
341-
"skbuff, packet dropped\n",
342-
work->ipprt);
343340
cvm_oct_free_work(work);
344341
continue;
345342
}

0 commit comments

Comments
 (0)