4 files changed, 12 insertions, 18 deletions
diff --git a/datapath-windows/ovsext/Debug.h b/datapath-windows/ovsext/Debug.h
index 4b7b52651..45f3c4910 100644
--- a/datapath-windows/ovsext/Debug.h
+++ b/datapath-windows/ovsext/Debug.h
@@ -31,16 +31,15 @@
 #define OVS_DBG_CHECKSUM BIT32(11)
 #define OVS_DBG_VXLAN    BIT32(12)
 #define OVS_DBG_GRE      BIT32(13)
-#define OVS_DBG_GRE64    BIT32(14)
-#define OVS_DBG_ACTION   BIT32(15)
-#define OVS_DBG_DATAPATH BIT32(16)
-#define OVS_DBG_PROPERTY BIT32(17)
-#define OVS_DBG_IPHELPER BIT32(18)
-#define OVS_DBG_BUFMGMT  BIT32(19)
-#define OVS_DBG_OTHERS   BIT32(21)
-#define OVS_DBG_NETLINK  BIT32(22)
-#define OVS_DBG_TUNFLT   BIT32(23)
-#define OVS_DBG_STT      BIT32(24)
+#define OVS_DBG_ACTION   BIT32(14)
+#define OVS_DBG_DATAPATH BIT32(15)
+#define OVS_DBG_PROPERTY BIT32(16)
+#define OVS_DBG_IPHELPER BIT32(17)
+#define OVS_DBG_BUFMGMT  BIT32(18)
+#define OVS_DBG_OTHERS   BIT32(19)
+#define OVS_DBG_NETLINK  BIT32(20)
+#define OVS_DBG_TUNFLT   BIT32(21)
+#define OVS_DBG_STT      BIT32(22)
 
 #define OVS_DBG_RESERVED BIT32(31)
 //Please add above OVS_DBG_RESERVED.
diff --git a/datapath-windows/ovsext/Switch.h b/datapath-windows/ovsext/Switch.h
index 3bc20eee4..001335a1e 100644
--- a/datapath-windows/ovsext/Switch.h
+++ b/datapath-windows/ovsext/Switch.h
@@ -37,8 +37,7 @@
 #define OVS_TUNNEL_INDEX_START RESERVED_START_INDEX1
 #define OVS_VXLAN_VPORT_INDEX    2
 #define OVS_GRE_VPORT_INDEX      3
-#define OVS_GRE64_VPORT_INDEX    4
-#define OVS_TUNNEL_INDEX_END OVS_GRE64_VPORT_INDEX
+#define OVS_TUNNEL_INDEX_END OVS_GRE_VPORT_INDEX
 
 #define OVS_MAX_PHYS_ADAPTERS    32
 #define OVS_MAX_IP_VPOR          32
diff --git a/datapath-windows/ovsext/Vport.c b/datapath-windows/ovsext/Vport.c
index 65a413404..0537c1fd5 100644
--- a/datapath-windows/ovsext/Vport.c
+++ b/datapath-windows/ovsext/Vport.c
@@ -914,8 +914,6 @@ OvsInitTunnelVport(PVOID userContext,
     switch (ovsType) {
     case OVS_VPORT_TYPE_GRE:
         break;
-    case OVS_VPORT_TYPE_GRE64:
-        break;
     case OVS_VPORT_TYPE_VXLAN:
     {
         POVS_TUNFLT_INIT_CONTEXT tunnelContext = NULL;
@@ -1178,7 +1176,6 @@ OvsRemoveAndDeleteVport(PVOID usrParamsContext,
         OvsCleanupSttTunnel(vport);
         break;
     case OVS_VPORT_TYPE_GRE:
-    case OVS_VPORT_TYPE_GRE64:
         break;
     case OVS_VPORT_TYPE_NETDEV:
         if (vport->isExternal) {
diff --git a/datapath-windows/ovsext/Vport.h b/datapath-windows/ovsext/Vport.h
index 4c6e858b1..ba21c6243 100644
--- a/datapath-windows/ovsext/Vport.h
+++ b/datapath-windows/ovsext/Vport.h
@@ -80,7 +80,7 @@ typedef struct _OVS_VPORT_FULL_STATS {
 /*
  * Each internal, external adapter or vritual adapter has
  * one vport entry. In addition, we have one vport for each
- * tunnel type, such as vxlan, gre, gre64
+ * tunnel type, such as vxlan, gre
  */
 typedef struct _OVS_VPORT_ENTRY {
     LIST_ENTRY             ovsNameLink;
@@ -181,8 +181,7 @@ OvsIsTunnelVportType(OVS_VPORT_TYPE ovsType)
 {
     return ovsType == OVS_VPORT_TYPE_VXLAN ||
            ovsType == OVS_VPORT_TYPE_STT ||
-           ovsType == OVS_VPORT_TYPE_GRE ||
-           ovsType == OVS_VPORT_TYPE_GRE64;
+           ovsType == OVS_VPORT_TYPE_GRE;
 }