Commit 910d2712 authored by Florian Westphal's avatar Florian Westphal
Browse files

netfilter: don't include xt and nftables.h in unrelated subsystems 



conntrack, xtables and nftables are distinct subsystems, don't use them
in other subystems.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent f7becf0d

include/linux/audit.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/ptrace.h>

#include <linux/audit_arch.h>

#include <uapi/linux/audit.h>

#include <uapi/linux/netfilter/nf_tables.h>

#include <uapi/linux/fanotify.h>



#define AUDIT_INO_UNSET ((unsigned long)-1)

include/net/netfilter/nf_conntrack_tuple.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef _NF_CONNTRACK_TUPLE_H

#define _NF_CONNTRACK_TUPLE_H



#include <linux/netfilter/x_tables.h>

#include <linux/netfilter.h>

#include <linux/netfilter/nf_conntrack_tuple_common.h>

#include <linux/list_nulls.h>

include/net/netfilter/nf_tables.h

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <linux/list.h>

#include <linux/netfilter.h>

#include <linux/netfilter/nfnetlink.h>

#include <linux/netfilter/x_tables.h>

#include <linux/netfilter/nf_tables.h>

#include <linux/u64_stats_sync.h>

#include <linux/rhashtable.h>

net/bridge/netfilter/nf_conntrack_bridge.c

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
#include <net/netfilter/nf_conntrack_helper.h>

#include <net/netfilter/nf_conntrack_bridge.h>



#include <linux/netfilter/nf_tables.h>

#include <net/netfilter/nf_tables.h>

#include <linux/netfilter_ipv4.h>



#include "../br_private.h"

net/netfilter/nf_conntrack_h323_main.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/skbuff.h>

#include <net/route.h>

#include <net/ip6_route.h>

#include <linux/netfilter_ipv4.h>

#include <linux/netfilter_ipv6.h>



#include <net/netfilter/nf_conntrack.h>