aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6mr.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/ip6mr.c')
-rw-r--r--net/ipv6/ip6mr.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 163850e22b11..bd9e7d3e9c8e 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -658,14 +658,12 @@ static int pim6_rcv(struct sk_buff *skb)
658 skb->mac_header = skb->network_header; 658 skb->mac_header = skb->network_header;
659 skb_pull(skb, (u8 *)encap - skb->data); 659 skb_pull(skb, (u8 *)encap - skb->data);
660 skb_reset_network_header(skb); 660 skb_reset_network_header(skb);
661 skb->dev = reg_dev;
662 skb->protocol = htons(ETH_P_IPV6); 661 skb->protocol = htons(ETH_P_IPV6);
663 skb->ip_summed = 0; 662 skb->ip_summed = 0;
664 skb->pkt_type = PACKET_HOST; 663 skb->pkt_type = PACKET_HOST;
665 skb_dst_drop(skb); 664
666 reg_dev->stats.rx_bytes += skb->len; 665 skb_tunnel_rx(skb, reg_dev);
667 reg_dev->stats.rx_packets++; 666
668 nf_reset(skb);
669 netif_rx(skb); 667 netif_rx(skb);
670 dev_put(reg_dev); 668 dev_put(reg_dev);
671 return 0; 669 return 0;