net: dev_forward_skb should call nf_reset
authorBen Greear <greearb@candelatech.com>
Thu, 22 Jul 2010 09:54:47 +0000 (09:54 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 26 Jul 2010 04:58:46 +0000 (21:58 -0700)
With conn-track zones and probably with different network
namespaces, the netfilter logic needs to be re-calculated
on packet receive.  If the netfilter logic is not reset,
it will not be recalculated properly.  This patch adds
the nf_reset logic to dev_forward_skb.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 0ea10f849be862fff3219bc69ed4c5db0cbd9253..1f466e82ac339359ffa0587f0e1e1f324c0f5dd7 100644 (file)
@@ -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))) {