diff mbox series

[ovs-dev,V2,20/41] datapath: Use correct tunnel receive for ip6gre

Message ID 1526608674-12702-21-git-send-email-gvrose8192@gmail.com
State Superseded
Headers show
Series Add ERSPAN support | expand

Commit Message

Gregory Rose May 18, 2018, 1:57 a.m. UTC 
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>
---
 datapath/linux/compat/ip6_gre.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/datapath/linux/compat/ip6_gre.c b/datapath/linux/compat/ip6_gre.c
index 1e2f46a..085d04f 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;
 	}