Merge branch 'bugzilla-16271' into release

[linux-drm-fsl-dcu.git] / net / ipv4 / ipip.c

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 0b27b14dcc9d65e6545327ef98a3ece61419214f..7fd636711037ae9be434f4b091e040a70843ef69 100644 (file)
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -374,11 +374,8 @@ static int ipip_rcv(struct sk_buff *skb)
                skb->protocol = htons(ETH_P_IP);
                skb->pkt_type = PACKET_HOST;
 
-               tunnel->dev->stats.rx_packets++;
-               tunnel->dev->stats.rx_bytes += skb->len;
-               skb->dev = tunnel->dev;
-               skb_dst_drop(skb);
-               nf_reset(skb);
+               skb_tunnel_rx(skb, tunnel->dev);
+
                ipip_ecn_decapsulate(iph, skb);
                netif_rx(skb);
                rcu_read_unlock();