diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/core/dev.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 052dd478d3e1..63ec4bf89b29 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2627,18 +2627,15 @@ static int process_backlog(struct napi_struct *napi, int quota) | |||
2627 | local_irq_disable(); | 2627 | local_irq_disable(); |
2628 | skb = __skb_dequeue(&queue->input_pkt_queue); | 2628 | skb = __skb_dequeue(&queue->input_pkt_queue); |
2629 | if (!skb) { | 2629 | if (!skb) { |
2630 | __napi_complete(napi); | ||
2630 | local_irq_enable(); | 2631 | local_irq_enable(); |
2631 | napi_complete(napi); | 2632 | break; |
2632 | goto out; | ||
2633 | } | 2633 | } |
2634 | local_irq_enable(); | 2634 | local_irq_enable(); |
2635 | 2635 | ||
2636 | napi_gro_receive(napi, skb); | 2636 | netif_receive_skb(skb); |
2637 | } while (++work < quota && jiffies == start_time); | 2637 | } while (++work < quota && jiffies == start_time); |
2638 | 2638 | ||
2639 | napi_gro_flush(napi); | ||
2640 | |||
2641 | out: | ||
2642 | return work; | 2639 | return work; |
2643 | } | 2640 | } |
2644 | 2641 | ||