summaryrefslogtreecommitdiff
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2010-08-04 08:52:50 -0700
committerTony Luck <tony.luck@intel.com>2010-08-04 08:52:50 -0700
commit38e14a7cf1f5ecc1fadf2d8814bca07095786551 (patch)
tree42ae5b9af272337ff5b261ad728bb754f60b106a /net/core/dev.c
parent13a1e6e1a5adedeafbd09b1f5fa8f0ef837d5d3e (diff)
parenta95f9ac27105eba8b529a36d03af4f527aabec94 (diff)
Pull percpu256K into release branch
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 0ea10f849be8..1f466e82ac33 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1488,6 +1488,7 @@ static inline void net_timestamp_check(struct sk_buff *skb)
int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
{
skb_orphan(skb);
+ nf_reset(skb);
if (!(dev->flags & IFF_UP) ||
(skb->len > (dev->mtu + dev->hard_header_len))) {