mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
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 <aaro.koskinen@iki.fi> Acked-by: David Daney <david.daney@cavium.com> Acked-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ed12cd612a
commit
c35656db4d
2 changed files with 1 additions and 9 deletions
|
@ -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));
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue