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

Configure Feed

Select the types of activity you want to include in your feed.

netfilter: nf_conntrack: don't rely on implicit includes

several netfilter compilation units rely on implicit includes
coming from nf_conntrack_proto_gre.h.

Clean this up and add the required dependencies where needed.

nf_conntrack.h requires net_generic() helper.
Place various gre/ppp/vlan includes to where they are needed.

Signed-off-by: Florian Westphal <fw@strlen.de>

Florian Westphal d00453b6 910d2712

+17 -3
-3
include/linux/netfilter/nf_conntrack_proto_gre.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 2 #ifndef _CONNTRACK_PROTO_GRE_H 3 3 #define _CONNTRACK_PROTO_GRE_H 4 - #include <asm/byteorder.h> 5 - #include <net/gre.h> 6 - #include <net/pptp.h> 7 4 8 5 struct nf_ct_gre { 9 6 unsigned int stream_timeout;
+1
include/net/netfilter/nf_conntrack.h
··· 16 16 #include <linux/bitops.h> 17 17 #include <linux/compiler.h> 18 18 19 + #include <net/netns/generic.h> 19 20 #include <linux/netfilter/nf_conntrack_common.h> 20 21 #include <linux/netfilter/nf_conntrack_tcp.h> 21 22 #include <linux/netfilter/nf_conntrack_sctp.h>
+1
net/netfilter/nf_conntrack_bpf.c
··· 14 14 #include <linux/types.h> 15 15 #include <linux/btf_ids.h> 16 16 #include <linux/net_namespace.h> 17 + #include <net/sock.h> 17 18 #include <net/xdp.h> 18 19 #include <net/netfilter/nf_conntrack_bpf.h> 19 20 #include <net/netfilter/nf_conntrack_core.h>
+1
net/netfilter/nf_conntrack_netlink.c
··· 32 32 #include <linux/siphash.h> 33 33 34 34 #include <linux/netfilter.h> 35 + #include <net/ipv6.h> 35 36 #include <net/netlink.h> 36 37 #include <net/sock.h> 37 38 #include <net/netfilter/nf_conntrack.h>
+2
net/netfilter/nf_conntrack_proto_gre.c
··· 33 33 #include <linux/skbuff.h> 34 34 #include <linux/slab.h> 35 35 #include <net/dst.h> 36 + #include <net/gre.h> 36 37 #include <net/net_namespace.h> 37 38 #include <net/netns/generic.h> 38 39 #include <net/netfilter/nf_conntrack_l4proto.h> 39 40 #include <net/netfilter/nf_conntrack_helper.h> 40 41 #include <net/netfilter/nf_conntrack_core.h> 41 42 #include <net/netfilter/nf_conntrack_timeout.h> 43 + #include <net/pptp.h> 42 44 #include <linux/netfilter/nf_conntrack_proto_gre.h> 43 45 #include <linux/netfilter/nf_conntrack_pptp.h> 44 46
+2
net/netfilter/nf_flow_table_ip.c
··· 8 8 #include <linux/ipv6.h> 9 9 #include <linux/netdevice.h> 10 10 #include <linux/if_ether.h> 11 + #include <linux/if_vlan.h> 12 + #include <net/gre.h> 11 13 #include <net/gso.h> 12 14 #include <net/ip.h> 13 15 #include <net/ipv6.h>
+1
net/netfilter/nf_flow_table_offload.c
··· 6 6 #include <linux/netdevice.h> 7 7 #include <linux/tc_act/tc_csum.h> 8 8 #include <net/flow_offload.h> 9 + #include <net/ip_tunnels.h> 9 10 #include <net/netfilter/nf_flow_table.h> 10 11 #include <net/netfilter/nf_tables.h> 11 12 #include <net/netfilter/nf_conntrack.h>
+1
net/netfilter/nf_flow_table_path.c
··· 2 2 #include <linux/kernel.h> 3 3 #include <linux/module.h> 4 4 #include <linux/init.h> 5 + #include <linux/etherdevice.h> 5 6 #include <linux/netlink.h> 6 7 #include <linux/netfilter.h> 7 8 #include <linux/spinlock.h>
+3
net/netfilter/nf_nat_ovs.c
··· 2 2 /* Support nat functions for openvswitch and used by OVS and TC conntrack. */ 3 3 4 4 #include <net/netfilter/nf_nat.h> 5 + #include <net/ipv6.h> 6 + #include <linux/ip.h> 7 + #include <linux/if_vlan.h> 5 8 6 9 /* Modelled after nf_nat_ipv[46]_fn(). 7 10 * range is only used for new, uninitialized NAT state.
+1
net/netfilter/nf_nat_proto.c
··· 25 25 #include <net/ip6_route.h> 26 26 #include <net/xfrm.h> 27 27 #include <net/ipv6.h> 28 + #include <net/pptp.h> 28 29 29 30 #include <net/netfilter/nf_conntrack_core.h> 30 31 #include <net/netfilter/nf_conntrack.h>
+1
net/netfilter/nft_flow_offload.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0-only 2 + #include <linux/etherdevice.h> 2 3 #include <linux/kernel.h> 3 4 #include <linux/module.h> 4 5 #include <linux/init.h>
+2
net/sched/act_ct.c
··· 13 13 #include <linux/skbuff.h> 14 14 #include <linux/rtnetlink.h> 15 15 #include <linux/pkt_cls.h> 16 + #include <linux/if_tunnel.h> 16 17 #include <linux/ip.h> 17 18 #include <linux/ipv6.h> 18 19 #include <linux/rhashtable.h> 20 + #include <net/gre.h> 19 21 #include <net/netlink.h> 20 22 #include <net/pkt_sched.h> 21 23 #include <net/pkt_cls.h>
+1
net/sched/act_ctinfo.c
··· 16 16 #include <net/pkt_sched.h> 17 17 #include <net/act_api.h> 18 18 #include <net/pkt_cls.h> 19 + #include <net/inet_ecn.h> 19 20 #include <uapi/linux/tc_act/tc_ctinfo.h> 20 21 #include <net/tc_act/tc_ctinfo.h> 21 22 #include <net/tc_wrapper.h>