Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: nf_conntrack_tuple_common.h: fix #include

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>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Davide Caratti and committed by
Pablo Neira Ayuso
3fefeb88 f6b3ef5e

+3
+3
include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
··· 2 2 #define _NF_CONNTRACK_TUPLE_COMMON_H 3 3 4 4 #include <linux/types.h> 5 + #ifndef __KERNEL__ 5 6 #include <linux/netfilter.h> 7 + #endif 8 + #include <linux/netfilter/nf_conntrack_common.h> /* IP_CT_IS_REPLY */ 6 9 7 10 enum ip_conntrack_dir { 8 11 IP_CT_DIR_ORIGINAL,