tunnels: harmonize cleanup done on skb on rx path

[~andy/linux] / net / ipv6 / ip6mr.c

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index a60a84ef04f7f880b23479e9f8fa047b3905af75..f365310bfcca30420a9cce321c1875d7f4319c21 100644 (file)
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -672,9 +672,8 @@ static int pim6_rcv(struct sk_buff *skb)
        skb_reset_network_header(skb);
        skb->protocol = htons(ETH_P_IPV6);
        skb->ip_summed = CHECKSUM_NONE;
-       skb->pkt_type = PACKET_HOST;
 
-       skb_tunnel_rx(skb, reg_dev);
+       skb_tunnel_rx(skb, reg_dev, dev_net(reg_dev));
 
        netif_rx(skb);