diff --git a/[refs] b/[refs] index 66586820cb52..02e93d5e4afc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4d1aa40e363ed3e0486aeeeb0d173f7f822737e +refs/heads/master: 0e698bf6624c469cd4f3f391247b142963ca9c4e diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index d7fe32c946c1..ac7609d85187 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -3322,7 +3322,7 @@ static int __netif_receive_skb(struct sk_buff *skb) if (pt_prev) { if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC))) - ret = -ENOMEM; + goto drop; else ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev); } else {