From cac83e8a3ba131d162470310d38f8cc0c6a5a719 Mon Sep 17 00:00:00 2001 From: Shmulik Ladkani Date: Wed, 27 Mar 2013 23:13:26 +0000 Subject: [PATCH] --- yaml --- r: 362062 b: refs/heads/master c: a561cf7edf9863198bfccecfc5cfe26d951ebd20 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0f40a860f9d3..ee181faa528f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c51e53689569398d656e631c17308d9b8e84650 +refs/heads/master: a561cf7edf9863198bfccecfc5cfe26d951ebd20 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index b13e5c766c11..6591440cc03d 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1624,7 +1624,6 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb) } skb_orphan(skb); - nf_reset(skb); if (unlikely(!is_skb_forwardable(dev, skb))) { atomic_long_inc(&dev->rx_dropped);