X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif-sflow.c;h=264f2dbcb1dcd87a881fddd0da4dba62132db0f0;hb=99e7b077407c51b291ddcc238e4ac83e9f732925;hp=185addf0981207f9ccba56f0ae3590c34ddd896d;hpb=f786a3158e525004e3c23bc24b954121a50a78c7;p=cascardo%2Fovs.git

diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c
index 185addf09..264f2dbcb 100644
--- 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;