From: Jesse Gross <jesse@nicira.com>
Date: Fri, 25 Jan 2013 22:12:44 +0000 (-0800)
Subject: datapath: Remove compatibility GRE identifier.
X-Git-Tag: sliver-openvswitch-1.9.90-3~3^2~13
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=953753fa4d8bdfcdc718cf8c38184589d4d6b13b

datapath: Remove compatibility GRE identifier.

We want to move the GRE vport ID into the upstream range but in
order to ease the transition kept the old ID around for one release.
This removes the old value.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Kyle Mestery <kmestery@cisco.com>
---

diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c
index c0113458e..14c5ba340 100644
--- a/datapath/vport-gre.c
+++ b/datapath/vport-gre.c
@@ -306,11 +306,6 @@ static struct vport *gre_create(const struct vport_parms *parms)
 	return ovs_tnl_create(parms, &ovs_gre_vport_ops, &gre_tnl_ops);
 }
 
-static struct vport *gre_create_ft(const struct vport_parms *parms)
-{
-	return ovs_tnl_create(parms, &ovs_gre_ft_vport_ops, &gre_tnl_ops);
-}
-
 static const struct tnl_ops gre64_tnl_ops = {
 	.tunnel_type	= TNL_T_PROTO_GRE64,
 	.ipproto	= IPPROTO_GRE,
@@ -357,19 +352,6 @@ static void gre_exit(void)
 	inet_del_protocol(&gre_protocol_handlers, IPPROTO_GRE);
 }
 
-const struct vport_ops ovs_gre_ft_vport_ops = {
-	.type		= OVS_VPORT_TYPE_FT_GRE,
-	.flags		= VPORT_F_TUN_ID,
-	.init		= gre_init,
-	.exit		= gre_exit,
-	.create		= gre_create_ft,
-	.destroy	= ovs_tnl_destroy,
-	.get_name	= ovs_tnl_get_name,
-	.get_options	= ovs_tnl_get_options,
-	.set_options	= ovs_tnl_set_options,
-	.send		= ovs_tnl_send,
-};
-
 const struct vport_ops ovs_gre_vport_ops = {
 	.type		= OVS_VPORT_TYPE_GRE,
 	.flags		= VPORT_F_TUN_ID,
diff --git a/datapath/vport.c b/datapath/vport.c
index 994df7e65..eb87c991f 100644
--- a/datapath/vport.c
+++ b/datapath/vport.c
@@ -41,7 +41,6 @@ static const struct vport_ops *base_vport_ops_list[] = {
 	&ovs_internal_vport_ops,
 	&ovs_patch_vport_ops,
 	&ovs_gre_vport_ops,
-	&ovs_gre_ft_vport_ops,
 	&ovs_gre64_vport_ops,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
 	&ovs_capwap_vport_ops,
diff --git a/datapath/vport.h b/datapath/vport.h
index 9d383caa9..e4de41d6f 100644
--- a/datapath/vport.h
+++ b/datapath/vport.h
@@ -230,7 +230,6 @@ extern const struct vport_ops ovs_netdev_vport_ops;
 extern const struct vport_ops ovs_internal_vport_ops;
 extern const struct vport_ops ovs_patch_vport_ops;
 extern const struct vport_ops ovs_gre_vport_ops;
-extern const struct vport_ops ovs_gre_ft_vport_ops;
 extern const struct vport_ops ovs_gre64_vport_ops;
 extern const struct vport_ops ovs_capwap_vport_ops;
 extern const struct vport_ops ovs_vxlan_vport_ops;
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h
index 738309771..5ad0bc00c 100644
--- a/include/linux/openvswitch.h
+++ b/include/linux/openvswitch.h
@@ -182,11 +182,10 @@ enum ovs_vport_type {
 	OVS_VPORT_TYPE_UNSPEC,
 	OVS_VPORT_TYPE_NETDEV,   /* network device */
 	OVS_VPORT_TYPE_INTERNAL, /* network device implemented by datapath */
-	OVS_VPORT_TYPE_FT_GRE,	 /* Flow based GRE tunnel. */
+	OVS_VPORT_TYPE_GRE,	 /* GRE tunnel. */
 	OVS_VPORT_TYPE_VXLAN,    /* VXLAN tunnel */
 	OVS_VPORT_TYPE_PATCH = 100, /* virtual tunnel connecting two vports */
-	OVS_VPORT_TYPE_GRE,      /* GRE tunnel */
-	OVS_VPORT_TYPE_CAPWAP,   /* CAPWAP tunnel */
+	OVS_VPORT_TYPE_CAPWAP = 102,  /* CAPWAP tunnel */
 	OVS_VPORT_TYPE_GRE64 = 104, /* GRE tunnel with 64-bit keys */
 	__OVS_VPORT_TYPE_MAX
 };
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index e52557feb..98ef18669 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -193,7 +193,6 @@ netdev_vport_get_netdev_type(const struct dpif_linux_vport *vport)
     case OVS_VPORT_TYPE_VXLAN:
         return "vxlan";
 
-    case OVS_VPORT_TYPE_FT_GRE:
     case __OVS_VPORT_TYPE_MAX:
         break;
     }