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 c0113458ea13f34214a93303cf200e3f1e271695..14c5ba340e927881a5bc0a47ee6f68b6fe6e2abe 100644 (file)
--- 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 994df7e65d754bcecd13cc1acb09a99f6771c6a0..eb87c991fb674e925e4a757e6a747485421a1e8c 100644 (file)
--- 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 9d383caa93515ed690ebcc466158ebafd2ea0d5a..e4de41d6ff51ed974eb6d799588474ae4ba0af1c 100644 (file)
--- 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 738309771e6aa876344a927f8bb6b58a5443267f..5ad0bc00c6f26c45a1d74ccfeed7b351ee7d691c 100644 (file)
--- 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 e52557feb5b477acf175d3dc2c6842693e251966..98ef1866973a408967830f373585da5c50eda662 100644 (file)
--- 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;
     }