X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport-gre.c;h=4411cac93840effa31749ec61e6e0c0b51145568;hb=8b36f51e0fdeb468058e4552858af03851b4fad3;hp=6e965cd83a651352ab6a4c449b549b92836ff9db;hpb=a9a29d22d8f485bb90bb49ae9ddff8c3c1ab04f5;p=openvswitch

diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c
index 6e965cd8..4411cac9 100644
--- a/datapath/vport-gre.c
+++ b/datapath/vport-gre.c
@@ -205,8 +205,8 @@ static void gre_err(struct sk_buff *skb, u32 info)
 	if (tunnel_hdr_len < 0)
 		return;
 
-	vport = tnl_find_port(iph->saddr, iph->daddr, key, TNL_T_PROTO_GRE,
-			      &mutable);
+	vport = ovs_tnl_find_port(iph->saddr, iph->daddr, key, TNL_T_PROTO_GRE,
+				  &mutable);
 	if (!vport)
 		return;
 
@@ -283,7 +283,7 @@ static void gre_err(struct sk_buff *skb, u32 info)
 #endif
 
 	__skb_pull(skb, tunnel_hdr_len);
-	tnl_frag_needed(vport, mutable, skb, mtu, key);
+	ovs_tnl_frag_needed(vport, mutable, skb, mtu, key);
 	__skb_push(skb, tunnel_hdr_len);
 
 out:
@@ -342,8 +342,8 @@ static int gre_rcv(struct sk_buff *skb)
 		goto error;
 
 	iph = ip_hdr(skb);
-	vport = tnl_find_port(iph->daddr, iph->saddr, key, TNL_T_PROTO_GRE,
-			      &mutable);
+	vport = ovs_tnl_find_port(iph->daddr, iph->saddr, key, TNL_T_PROTO_GRE,
+				  &mutable);
 	if (unlikely(!vport)) {
 		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
 		goto error;
@@ -357,7 +357,7 @@ static int gre_rcv(struct sk_buff *skb)
 	__skb_pull(skb, hdr_len);
 	skb_postpull_rcsum(skb, skb_transport_header(skb), hdr_len + ETH_HLEN);
 
-	tnl_rcv(vport, skb, iph->tos);
+	ovs_tnl_rcv(vport, skb, iph->tos);
 	return 0;
 
 error:
@@ -375,7 +375,7 @@ static const struct tnl_ops gre_tnl_ops = {
 
 static struct vport *gre_create(const struct vport_parms *parms)
 {
-	return tnl_create(parms, &gre_vport_ops, &gre_tnl_ops);
+	return ovs_tnl_create(parms, &ovs_gre_vport_ops, &gre_tnl_ops);
 }
 
 static const struct net_protocol gre_protocol_handlers = {
@@ -399,20 +399,20 @@ static void gre_exit(void)
 	inet_del_protocol(&gre_protocol_handlers, IPPROTO_GRE);
 }
 
-const struct vport_ops gre_vport_ops = {
+const struct vport_ops ovs_gre_vport_ops = {
 	.type		= OVS_VPORT_TYPE_GRE,
 	.flags		= VPORT_F_TUN_ID,
 	.init		= gre_init,
 	.exit		= gre_exit,
 	.create		= gre_create,
-	.destroy	= tnl_destroy,
-	.set_addr	= tnl_set_addr,
-	.get_name	= tnl_get_name,
-	.get_addr	= tnl_get_addr,
-	.get_options	= tnl_get_options,
-	.set_options	= tnl_set_options,
-	.get_dev_flags	= vport_gen_get_dev_flags,
-	.is_running	= vport_gen_is_running,
-	.get_operstate	= vport_gen_get_operstate,
-	.send		= tnl_send,
+	.destroy	= ovs_tnl_destroy,
+	.set_addr	= ovs_tnl_set_addr,
+	.get_name	= ovs_tnl_get_name,
+	.get_addr	= ovs_tnl_get_addr,
+	.get_options	= ovs_tnl_get_options,
+	.set_options	= ovs_tnl_set_options,
+	.get_dev_flags	= ovs_vport_gen_get_dev_flags,
+	.is_running	= ovs_vport_gen_is_running,
+	.get_operstate	= ovs_vport_gen_get_operstate,
+	.send		= ovs_tnl_send,
 };