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

netfilter: update include directives.

Include some headers in files which require them, and remove others
which are not required.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Jeremy Sowden and committed by
Pablo Neira Ayuso 40d102cd 85cfbc25

+27 -18
+2 -1
include/net/netfilter/nf_conntrack_core.h
··· 14 14 #define _NF_CONNTRACK_CORE_H 15 15 16 16 #include <linux/netfilter.h> 17 - #include <net/netfilter/nf_conntrack_l4proto.h> 17 + #include <net/netfilter/nf_conntrack.h> 18 18 #include <net/netfilter/nf_conntrack_ecache.h> 19 + #include <net/netfilter/nf_conntrack_l4proto.h> 19 20 20 21 /* This header is used to share core functionality between the 21 22 standalone connection tracking module, and the compatibility layer's use
+2 -1
include/net/netfilter/nf_conntrack_zones.h
··· 5 5 #include <linux/netfilter/nf_conntrack_zones_common.h> 6 6 7 7 #if IS_ENABLED(CONFIG_NF_CONNTRACK) 8 - #include <net/netfilter/nf_conntrack_extend.h> 8 + 9 + #include <net/netfilter/nf_conntrack.h> 9 10 10 11 static inline const struct nf_conntrack_zone * 11 12 nf_ct_zone(const struct nf_conn *ct)
+6 -7
include/net/netfilter/nf_nat.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 2 #ifndef _NF_NAT_H 3 3 #define _NF_NAT_H 4 + 5 + #include <linux/list.h> 4 6 #include <linux/netfilter_ipv4.h> 5 - #include <linux/netfilter/nf_nat.h> 7 + #include <linux/netfilter/nf_conntrack_pptp.h> 8 + #include <net/netfilter/nf_conntrack.h> 9 + #include <net/netfilter/nf_conntrack_extend.h> 6 10 #include <net/netfilter/nf_conntrack_tuple.h> 11 + #include <uapi/linux/netfilter/nf_nat.h> 7 12 8 13 enum nf_nat_manip_type { 9 14 NF_NAT_MANIP_SRC, ··· 19 14 #define HOOK2MANIP(hooknum) ((hooknum) != NF_INET_POST_ROUTING && \ 20 15 (hooknum) != NF_INET_LOCAL_IN) 21 16 22 - #include <linux/list.h> 23 - #include <linux/netfilter/nf_conntrack_pptp.h> 24 - #include <net/netfilter/nf_conntrack_extend.h> 25 - 26 17 /* per conntrack: nat application helper private data */ 27 18 union nf_conntrack_nat_help { 28 19 /* insert nat helper private data here */ ··· 26 25 struct nf_nat_pptp nat_pptp_info; 27 26 #endif 28 27 }; 29 - 30 - struct nf_conn; 31 28 32 29 /* The structure embedded in the conntrack structure. */ 33 30 struct nf_conn_nat {
+1
include/net/netfilter/nf_nat_masquerade.h
··· 2 2 #ifndef _NF_NAT_MASQUERADE_H_ 3 3 #define _NF_NAT_MASQUERADE_H_ 4 4 5 + #include <linux/skbuff.h> 5 6 #include <net/netfilter/nf_nat.h> 6 7 7 8 unsigned int
-1
net/bridge/netfilter/nf_conntrack_bridge.c
··· 17 17 #include <net/netfilter/nf_conntrack_bridge.h> 18 18 19 19 #include <linux/netfilter/nf_tables.h> 20 - #include <net/netfilter/ipv6/nf_defrag_ipv6.h> 21 20 #include <net/netfilter/nf_tables.h> 22 21 23 22 #include "../br_private.h"
-1
net/ipv6/netfilter/nf_socket_ipv6.c
··· 12 12 #include <net/sock.h> 13 13 #include <net/inet_sock.h> 14 14 #include <net/inet6_hashtables.h> 15 - #include <net/netfilter/ipv6/nf_defrag_ipv6.h> 16 15 #include <net/netfilter/nf_socket.h> 17 16 #if IS_ENABLED(CONFIG_NF_CONNTRACK) 18 17 #include <net/netfilter/nf_conntrack.h>
+1
net/netfilter/nf_conntrack_ecache.c
··· 24 24 25 25 #include <net/netfilter/nf_conntrack.h> 26 26 #include <net/netfilter/nf_conntrack_core.h> 27 + #include <net/netfilter/nf_conntrack_ecache.h> 27 28 #include <net/netfilter/nf_conntrack_extend.h> 28 29 29 30 static DEFINE_MUTEX(nf_ct_ecache_mutex);
+2
net/netfilter/nf_conntrack_expect.c
··· 25 25 26 26 #include <net/netfilter/nf_conntrack.h> 27 27 #include <net/netfilter/nf_conntrack_core.h> 28 + #include <net/netfilter/nf_conntrack_ecache.h> 28 29 #include <net/netfilter/nf_conntrack_expect.h> 29 30 #include <net/netfilter/nf_conntrack_helper.h> 31 + #include <net/netfilter/nf_conntrack_l4proto.h> 30 32 #include <net/netfilter/nf_conntrack_tuple.h> 31 33 #include <net/netfilter/nf_conntrack_zones.h> 32 34
+3 -2
net/netfilter/nf_conntrack_helper.c
··· 21 21 #include <linux/rtnetlink.h> 22 22 23 23 #include <net/netfilter/nf_conntrack.h> 24 - #include <net/netfilter/nf_conntrack_l4proto.h> 25 - #include <net/netfilter/nf_conntrack_helper.h> 26 24 #include <net/netfilter/nf_conntrack_core.h> 25 + #include <net/netfilter/nf_conntrack_ecache.h> 27 26 #include <net/netfilter/nf_conntrack_extend.h> 27 + #include <net/netfilter/nf_conntrack_helper.h> 28 + #include <net/netfilter/nf_conntrack_l4proto.h> 28 29 #include <net/netfilter/nf_log.h> 29 30 30 31 static DEFINE_MUTEX(nf_ct_helper_mutex);
+1
net/netfilter/nf_conntrack_timeout.c
··· 19 19 #include <net/netfilter/nf_conntrack.h> 20 20 #include <net/netfilter/nf_conntrack_core.h> 21 21 #include <net/netfilter/nf_conntrack_extend.h> 22 + #include <net/netfilter/nf_conntrack_l4proto.h> 22 23 #include <net/netfilter/nf_conntrack_timeout.h> 23 24 24 25 struct nf_ct_timeout *
+1
net/netfilter/nf_flow_table_core.c
··· 11 11 #include <net/netfilter/nf_flow_table.h> 12 12 #include <net/netfilter/nf_conntrack.h> 13 13 #include <net/netfilter/nf_conntrack_core.h> 14 + #include <net/netfilter/nf_conntrack_l4proto.h> 14 15 #include <net/netfilter/nf_conntrack_tuple.h> 15 16 16 17 struct flow_offload_entry {
+3 -3
net/netfilter/nf_nat_core.c
··· 18 18 19 19 #include <net/netfilter/nf_conntrack.h> 20 20 #include <net/netfilter/nf_conntrack_core.h> 21 - #include <net/netfilter/nf_nat.h> 22 - #include <net/netfilter/nf_nat_helper.h> 23 21 #include <net/netfilter/nf_conntrack_helper.h> 24 22 #include <net/netfilter/nf_conntrack_seqadj.h> 25 23 #include <net/netfilter/nf_conntrack_zones.h> 26 - #include <linux/netfilter/nf_nat.h> 24 + #include <net/netfilter/nf_nat.h> 25 + #include <net/netfilter/nf_nat_helper.h> 26 + #include <uapi/linux/netfilter/nf_nat.h> 27 27 28 28 #include "nf_internals.h" 29 29
+2 -1
net/netfilter/nft_flow_offload.c
··· 6 6 #include <linux/netfilter.h> 7 7 #include <linux/workqueue.h> 8 8 #include <linux/spinlock.h> 9 + #include <linux/netfilter/nf_conntrack_common.h> 9 10 #include <linux/netfilter/nf_tables.h> 10 11 #include <net/ip.h> /* for ipv4 options. */ 11 12 #include <net/netfilter/nf_tables.h> 12 13 #include <net/netfilter/nf_tables_core.h> 13 14 #include <net/netfilter/nf_conntrack_core.h> 14 - #include <linux/netfilter/nf_conntrack_common.h> 15 + #include <net/netfilter/nf_conntrack_extend.h> 15 16 #include <net/netfilter/nf_flow_table.h> 16 17 17 18 struct nft_flow_offload {
+2
net/netfilter/xt_connlimit.c
··· 13 13 */ 14 14 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 15 15 16 + #include <linux/ip.h> 17 + #include <linux/ipv6.h> 16 18 #include <linux/module.h> 17 19 #include <linux/skbuff.h> 18 20 #include <linux/netfilter/x_tables.h>
+1 -1
net/sched/act_ct.c
··· 24 24 #include <uapi/linux/tc_act/tc_ct.h> 25 25 #include <net/tc_act/tc_ct.h> 26 26 27 - #include <linux/netfilter/nf_nat.h> 28 27 #include <net/netfilter/nf_conntrack.h> 29 28 #include <net/netfilter/nf_conntrack_core.h> 30 29 #include <net/netfilter/nf_conntrack_zones.h> 31 30 #include <net/netfilter/nf_conntrack_helper.h> 32 31 #include <net/netfilter/ipv6/nf_defrag_ipv6.h> 32 + #include <uapi/linux/netfilter/nf_nat.h> 33 33 34 34 static struct tc_action_ops act_ct_ops; 35 35 static unsigned int ct_net_id;