tunneling: Remove gre64 tunnel support.

[cascardo/ovs.git] / ofproto / ofproto-dpif-sflow.c

diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c
index 185addf..264f2db 100644 (file)
--- a/ofproto/ofproto-dpif-sflow.c
+++ b/ofproto/ofproto-dpif-sflow.c
@@ -60,10 +60,8 @@ enum dpif_sflow_tunnel_type {
     DPIF_SFLOW_TUNNEL_UNKNOWN = 0,
     DPIF_SFLOW_TUNNEL_VXLAN,
     DPIF_SFLOW_TUNNEL_GRE,
-    DPIF_SFLOW_TUNNEL_GRE64,
     DPIF_SFLOW_TUNNEL_LISP,
     DPIF_SFLOW_TUNNEL_IPSEC_GRE,
-    DPIF_SFLOW_TUNNEL_IPSEC_GRE64,
     DPIF_SFLOW_TUNNEL_GENEVE
 };
 
@@ -590,12 +588,8 @@ dpif_sflow_tunnel_type(struct ofport *ofport) {
     if (type) {
        if (strcmp(type, "gre") == 0) {
            return DPIF_SFLOW_TUNNEL_GRE;
-       } else if (strcmp(type, "gre64") == 0) {
-           return DPIF_SFLOW_TUNNEL_GRE64;
        } else if (strcmp(type, "ipsec_gre") == 0) {
            return DPIF_SFLOW_TUNNEL_IPSEC_GRE;
-       } else if (strcmp(type, "ipsec_gre64") == 0) {
-           return DPIF_SFLOW_TUNNEL_IPSEC_GRE64;
        } else if (strcmp(type, "vxlan") == 0) {
            return DPIF_SFLOW_TUNNEL_VXLAN;
        } else if (strcmp(type, "lisp") == 0) {
@@ -615,12 +609,10 @@ dpif_sflow_tunnel_proto(enum dpif_sflow_tunnel_type tunnel_type)
     switch(tunnel_type) {
 
     case DPIF_SFLOW_TUNNEL_GRE:
-    case DPIF_SFLOW_TUNNEL_GRE64:
         ipproto = IPPROTO_GRE;
         break;
 
     case DPIF_SFLOW_TUNNEL_IPSEC_GRE:
-    case DPIF_SFLOW_TUNNEL_IPSEC_GRE64:
         ipproto = IPPROTO_ESP;
         break;