diff options
| author |   Chris Zankel <chris@zankel.net> | 2014-11-10 00:05:43 -0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-11-10 00:05:43 -0800 |
| commit | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (patch) | |
| tree | ea1ee0a54d4c24221a1e80cd07e899f8b34a6920 /net/core/dev.c | |
| parent | Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xtensa into for_next (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | wireguard-linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.tar.xz wireguard-linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.zip | |
Merge tag 'v3.18-rc4' into for_next
Linux 3.18-rc4
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)); |