diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-16 11:31:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-16 11:31:17 +0100 |
| commit | f108c898ddae4bb1146ed9e46ce4470725d945c4 (patch) | |
| tree | bb887907e0448d4d903f853c33b3c55a863412e2 /net/core/dev.c | |
| parent | 904cb3677f3adcd3d837be0a0d0b14251ba8d6f7 (diff) | |
| parent | 68055915c1c22489f9658bd2b7391bb11b2cf4e4 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index b793e3521a36..945bbd001359 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4157,6 +4157,10 @@ EXPORT_SYMBOL(napi_gro_receive); static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb) { + if (unlikely(skb->pfmemalloc)) { + consume_skb(skb); + return; + } __skb_pull(skb, skb_headlen(skb)); /* restore the reserve we had after netdev_alloc_skb_ip_align() */ skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN - skb_headroom(skb)); |