diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-09-02 09:34:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-04 00:27:26 -0400 |
commit | ea23192e8e577dfc51e0f4fc5ca113af334edff9 (patch) | |
tree | 3568561a6128c5395dc0cf1b0f105e313d848d9b /net/ipv6/ip6mr.c | |
parent | 963a88b31ddbbe99f38502239b1a46601773d217 (diff) |
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>
Diffstat (limited to 'net/ipv6/ip6mr.c')
-rw-r--r-- | net/ipv6/ip6mr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index a60a84ef04f7..f365310bfcca 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c | |||
@@ -672,9 +672,8 @@ static int pim6_rcv(struct sk_buff *skb) | |||
672 | skb_reset_network_header(skb); | 672 | skb_reset_network_header(skb); |
673 | skb->protocol = htons(ETH_P_IPV6); | 673 | skb->protocol = htons(ETH_P_IPV6); |
674 | skb->ip_summed = CHECKSUM_NONE; | 674 | skb->ip_summed = CHECKSUM_NONE; |
675 | skb->pkt_type = PACKET_HOST; | ||
676 | 675 | ||
677 | skb_tunnel_rx(skb, reg_dev); | 676 | skb_tunnel_rx(skb, reg_dev, dev_net(reg_dev)); |
678 | 677 | ||
679 | netif_rx(skb); | 678 | netif_rx(skb); |
680 | 679 | ||