Skip to content

Commit

Permalink
netfilter: nf_conntrack_tuple_common.h: fix #include
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Davide Caratti authored and Pablo Neira Ayuso committed Dec 4, 2016
1 parent f6b3ef5 commit 3fefeb8
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 3fefeb8

Please sign in to comment.