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.
Showing the changes to include/uapi/linux (1 of 1 file). Show all
Unified · Split
| @@ -2,7 +2,10 @@ · 1 unmodified line | |||
| 2 | #define _NF_CONNTRACK_TUPLE_COMMON_H | 2 | #define _NF_CONNTRACK_TUPLE_COMMON_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #ifndef __KERNEL__ | ||
| 5 | #include <linux/netfilter.h> | 6 | #include <linux/netfilter.h> |
| 7 | #endif | ||
| 8 | #include <linux/netfilter/nf_conntrack_common.h> /* IP_CT_IS_REPLY */ | ||
| 6 | 9 | ||
| 7 | enum ip_conntrack_dir { | 10 | enum ip_conntrack_dir { |
| 8 | IP_CT_DIR_ORIGINAL, | 11 | IP_CT_DIR_ORIGINAL, |