Re: [PATCH nf-next v2 1/4] netfilter: nf_conntrack_tuple_common.h: fix #include

[Mikko Rapeli <mikko.rapeli@iki.fi>]

On Tue, Nov 15, 2016 at 03:08:24PM +0100, Davide Caratti wrote:
> To allow usage of enum ip_conntrack_dir in include/net/netns/conntrack.h,
> this patch encloses #include <linux/netfilter.h> in a #ifndef __KERNEL__
> directive, so that compiler errors caused by unwanted inclusion of
> include/linux/netfilter.h are avoided.
> In addition, #include <linux/netfilter/nf_conntrack_common.h> line has
> been added to resolve correctly CTINFO2DIR macro.
> 
> Signed-off-by: Davide Caratti <dcaratti@redhat.com>

Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi>

-Mikko

> ---
>  include/uapi/linux/netfilter/nf_conntrack_tuple_common.h | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h b/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
> index a9c3834..526b424 100644
> --- a/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
> +++ b/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
> @@ -2,7 +2,10 @@
>  #define _NF_CONNTRACK_TUPLE_COMMON_H
>  
>  #include <linux/types.h>
> +#ifndef __KERNEL__
>  #include <linux/netfilter.h>
> +#endif
> +#include <linux/netfilter/nf_conntrack_common.h> /* IP_CT_IS_REPLY */
>  
>  enum ip_conntrack_dir {
>  	IP_CT_DIR_ORIGINAL,
> -- 
> 2.7.4
>