path: root/net
diff options
authorJesper Dangaard Brouer <>2016-03-11 09:43:58 +0100
committerDavid S. Miller <>2016-03-13 22:35:35 -0400
commit885eb0a516e4d686849b91c5a1ba25c70b7a6540 (patch)
treed6c23320fc70f5b5ab7354574a26447e5065d5e5 /net
parentc45569755e828a8458d125bb93feb1d90ac9be6f (diff)
net: adjust napi_consume_skb to handle non-NAPI callers
Some drivers reuse/share code paths that free SKBs between NAPI and non-NAPI calls. Adjust napi_consume_skb to handle this use-case. Before, calls from netpoll (w/ IRQs disabled) was handled and indicated with a budget zero indication. Use the same zero indication to handle calls not originating from NAPI/softirq. Simply handled by using dev_consume_skb_any(). This adds an extra branch+call for the netpoll case (checking in_irq() + irqs_disabled()), but that is okay as this is a slowpath. Suggested-by: Alexander Duyck <> Signed-off-by: Jesper Dangaard Brouer <> Signed-off-by: David S. Miller <>
Diffstat (limited to 'net')
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 51d768e7bc90..f044f970f1a6 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -801,9 +801,9 @@ void napi_consume_skb(struct sk_buff *skb, int budget)
if (unlikely(!skb))
- /* if budget is 0 assume netpoll w/ IRQs disabled */
+ /* Zero budget indicate non-NAPI context called us, like netpoll */
if (unlikely(!budget)) {
- dev_consume_skb_irq(skb);
+ dev_consume_skb_any(skb);