diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/octeon/ethernet-mem.c | 7 | ||||
| -rw-r--r-- | drivers/staging/octeon/ethernet-rx.c | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/octeon/ethernet-mem.c b/drivers/staging/octeon/ethernet-mem.c index 78b6cb743769..199059d64c9b 100644 --- a/drivers/staging/octeon/ethernet-mem.c +++ b/drivers/staging/octeon/ethernet-mem.c | |||
| @@ -48,13 +48,8 @@ static int cvm_oct_fill_hw_skbuff(int pool, int size, int elements) | |||
| 48 | while (freed) { | 48 | while (freed) { |
| 49 | 49 | ||
| 50 | struct sk_buff *skb = dev_alloc_skb(size + 256); | 50 | struct sk_buff *skb = dev_alloc_skb(size + 256); |
| 51 | if (unlikely(skb == NULL)) { | 51 | if (unlikely(skb == NULL)) |
| 52 | pr_warning | ||
| 53 | ("Failed to allocate skb for hardware pool %d\n", | ||
| 54 | pool); | ||
| 55 | break; | 52 | break; |
| 56 | } | ||
| 57 | |||
| 58 | skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f)); | 53 | skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f)); |
| 59 | *(struct sk_buff **)(skb->data - sizeof(void *)) = skb; | 54 | *(struct sk_buff **)(skb->data - sizeof(void *)) = skb; |
| 60 | cvmx_fpa_free(skb->data, pool, DONT_WRITEBACK(size / 128)); | 55 | cvmx_fpa_free(skb->data, pool, DONT_WRITEBACK(size / 128)); |
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c index 10e54165d89c..e14a1bb04361 100644 --- a/drivers/staging/octeon/ethernet-rx.c +++ b/drivers/staging/octeon/ethernet-rx.c | |||
| @@ -337,9 +337,6 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) | |||
| 337 | */ | 337 | */ |
| 338 | skb = dev_alloc_skb(work->len); | 338 | skb = dev_alloc_skb(work->len); |
| 339 | if (!skb) { | 339 | if (!skb) { |
| 340 | printk_ratelimited("Port %d failed to allocate " | ||
| 341 | "skbuff, packet dropped\n", | ||
| 342 | work->ipprt); | ||
| 343 | cvm_oct_free_work(work); | 340 | cvm_oct_free_work(work); |
| 344 | continue; | 341 | continue; |
| 345 | } | 342 | } |
