From: Greg Rose <gvrose8192@gmail.com>
Date: Wed, 9 May 2018 22:57:10 +0000 (-0700)
Subject: datapath: Use correct tunnel receive for ip6gre
X-Git-Tag: v2.12.3~1769
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c0e103c870b46e18adc87e4c51a75b415c9510ae;p=mirror_ovs.git

datapath: Use correct tunnel receive for ip6gre

During backports of ip6 gre I used ovs_ip_tunnel_rcv() for the
ip6gre_rcv() function but that is wrong because it processes ipv4
tunnels.  Use the correct backported ip6 tunnel receive in ip6
tunnel.c ip6_tnl_rcv().

Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: William Tu <u9012063@gmail.com>
---

diff --git a/datapath/linux/compat/ip6_gre.c b/datapath/linux/compat/ip6_gre.c
index 1e2f46a38..085d04fb7 100644
--- a/datapath/linux/compat/ip6_gre.c
+++ b/datapath/linux/compat/ip6_gre.c
@@ -603,8 +603,7 @@ static int ip6gre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi)
 
 		}
 
-		skb_reset_mac_header(skb);
-		ovs_ip_tunnel_rcv(tunnel->dev, skb, tun_dst);
+		ip6_tnl_rcv(tunnel, skb, tpi, tun_dst, false);
 		kfree(tun_dst);
 		return PACKET_RCVD;
 	}