From: Ansis Atteka Date: Thu, 14 Feb 2013 01:13:54 +0000 (-0800) Subject: ipsec: prepare IPsec for flow based tunneling X-Git-Tag: sliver-openvswitch-1.10.90-1~11^2~17 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=009e734c5825b7edadcd1cf84be6d454f42ddca6;p=sliver-openvswitch.git ipsec: prepare IPsec for flow based tunneling This patch removes unused TNL_F_IPSEC flag. Issue: 14870 Signed-off-by: Ansis Atteka Acked-by: Jesse Gross --- diff --git a/datapath/tunnel.h b/datapath/tunnel.h index b43ef4075..54c34ef0b 100644 --- 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 d9f92d568..c535a50a5 100644 --- 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 */