tunnels: harmonize cleanup done on skb on rx path

[deliverable/linux.git] / net / ipv6 / ip6_tunnel.c

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index ecbcdbd4bc4fa7bbb34ede10a1a36c17fb5da3f9..55999d923f265be4f6151437c0ee07523cfca503 100644 (file)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -802,14 +802,12 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol,
                        rcu_read_unlock();
                        goto discard;
                }
-               secpath_reset(skb);
                skb->mac_header = skb->network_header;
                skb_reset_network_header(skb);
                skb->protocol = htons(protocol);
-               skb->pkt_type = PACKET_HOST;
                memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
 
-               __skb_tunnel_rx(skb, t->dev);
+               __skb_tunnel_rx(skb, t->dev, t->net);
 
                err = dscp_ecn_decapsulate(t, ipv6h, skb);
                if (unlikely(err)) {
@@ -829,9 +827,6 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol,
                tstats->rx_packets++;
                tstats->rx_bytes += skb->len;
 
-               if (!net_eq(t->net, dev_net(t->dev)))
-                       skb_scrub_packet(skb, true);
-
                netif_rx(skb);
 
                rcu_read_unlock();