commit ea23192e8e577dfc51e0f4fc5ca113af334edff9
author Nicolas Dichtel <nicolas.dichtel@6wind.com> Mon Sep 02 15:34:58 2013 +0200
committer David S. Miller <davem@davemloft.net> Wed Sep 04 00:27:26 2013 -0400
tree 3568561a6128c5395dc0cf1b0f105e313d848d9b
parent 963a88b31ddbbe99f38502239b1a46601773d217

tunnels: harmonize cleanup done on skb on rx path

The goal of this patch is to harmonize cleanup done on a skbuff on rx path.
Before this patch, behaviors were different depending of the tunnel type.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv6/ip6mr.c

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index a60a84e..f365310 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -672,9 +672,8 @@
 	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);