Re: [PATCH] xfrm6: move define/ifdef check order

[Nicolas DICHTEL <nicolas.dichtel@6wind.com>]

I point out this issue a long time ago ...
http://marc.theaimsgroup.com/?l=linux-netdev&m=113032946908126&w=2


Regards,
Nicolas

Randy.Dunlap a écrit :
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> The first check for #ifdef XFRM6_TUNNEL_SPI_MAGIC needs to come after
> the optional #define of it, otherwise the variable won't be there
> for the rest of the code to use.
>
> Shouldn't that CONFIG_IPV6_XFRM6_TUNNEL_DEBUG be part of Kconfig
> or have its name changed?
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> ---
>  net/ipv6/xfrm6_tunnel.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> --- linux-2617-g20.orig/net/ipv6/xfrm6_tunnel.c
> +++ linux-2617-g20/net/ipv6/xfrm6_tunnel.c
> @@ -52,6 +52,10 @@
>  # define X6TPRINTK3	X6TNOPRINTK
>  #endif
>  
> +#ifdef CONFIG_IPV6_XFRM6_TUNNEL_DEBUG
> +# define XFRM6_TUNNEL_SPI_MAGIC 0xdeadbeef
> +#endif
> +
>  /*
>   * xfrm_tunnel_spi things are for allocating unique id ("spi") 
>   * per xfrm_address_t.
> @@ -67,10 +71,6 @@ struct xfrm6_tunnel_spi {
>  #endif
>  };
>  
> -#ifdef CONFIG_IPV6_XFRM6_TUNNEL_DEBUG
> -# define XFRM6_TUNNEL_SPI_MAGIC 0xdeadbeef
> -#endif
> -
>  static DEFINE_RWLOCK(xfrm6_tunnel_spi_lock);
>  
>  static u32 xfrm6_tunnel_spi;
>
>
> ---
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
>
>