ipsec: prepare IPsec for flow based tunneling

This patch removes unused TNL_F_IPSEC flag.

Issue: 14870
Signed-off-by: Ansis Atteka <aatteka@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index b43ef40..54c34ef 100644 (file)
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -55,7 +55,7 @@
 
 /* All public tunnel flags. */
 #define TNL_F_PUBLIC (TNL_F_CSUM | TNL_F_TOS_INHERIT | TNL_F_TTL_INHERIT | \
-                     TNL_F_DF_DEFAULT | TNL_F_IPSEC)
+                     TNL_F_DF_DEFAULT)
 
 /**
  * struct port_lookup_key - Tunnel port key, used as hash table key.

diff --git a/include/openvswitch/tunnel.h b/include/openvswitch/tunnel.h
index d9f92d5..c535a50 100644 (file)
--- a/include/openvswitch/tunnel.h
+++ b/include/openvswitch/tunnel.h
@@ -72,6 +72,6 @@ enum {
                                          * not IP. */
 /* Bit 5 was previously used for path MTU discovery. " */
 /* Bit 6 is reserved since it was previously used for Tunnel header caching. */
-#define TNL_F_IPSEC            (1 << 7) /* Traffic is IPsec encrypted. */
+/* Bit 7 was previously used for IPsec tunnel ports. */
 
 #endif /* openvswitch/tunnel.h */