All these 3 patches should be applied on branch-1.10.
On Thu, Feb 14, 2013 at 11:50 AM, Ansis Atteka <aatt...@nicira.com> wrote:
> This patch removes unused TNL_F_IPSEC flag.
>
> Issue: 14870
> Signed-off-by: Ansis Atteka <aatt...@nicira.com>
> ---
> datapath/tunnel.h | 2 +-
> include/openvswitch/tunnel.h | 1 -
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/datapath/tunnel.h b/datapath/tunnel.h
> index 7e4d1a6..93ce243 100644
> --- a/datapath/tunnel.h
> +++ b/datapath/tunnel.h
> @@ -56,7 +56,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..f42ad91 100644
> --- a/include/openvswitch/tunnel.h
> +++ b/include/openvswitch/tunnel.h
> @@ -72,6 +72,5 @@ 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. */
>
> #endif /* openvswitch/tunnel.h */
> --
> 1.7.9.5
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
