Merge commit 'v2.6.35' into kbuild/kbuild

[mv-sheeva.git] / net / ipv6 / sit.c

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 5abae10cd8844c8d2acb30ceced10055dbdf3856..e51e650ea80be7e4e2e0e0fe8514e3f14f0f1890 100644 (file)
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -566,11 +566,9 @@ static int ipip6_rcv(struct sk_buff *skb)
                        kfree_skb(skb);
                        return 0;
                }
-               tunnel->dev->stats.rx_packets++;
-               tunnel->dev->stats.rx_bytes += skb->len;
-               skb->dev = tunnel->dev;
-               skb_dst_drop(skb);
-               nf_reset(skb);
+
+               skb_tunnel_rx(skb, tunnel->dev);
+
                ipip6_ecn_decapsulate(iph, skb);
                netif_rx(skb);
                rcu_read_unlock();