Commit d00453b6 authored by Florian Westphal's avatar Florian Westphal
Browse files

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: default avatarFlorian Westphal <fw@strlen.de>
parent 910d2712

include/linux/netfilter/nf_conntrack_proto_gre.h

+0 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _CONNTRACK_PROTO_GRE_H

#define _CONNTRACK_PROTO_GRE_H

#include <asm/byteorder.h>

#include <net/gre.h>

#include <net/pptp.h>



struct nf_ct_gre {

	unsigned int stream_timeout;

include/net/netfilter/nf_conntrack.h

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

#include <linux/compiler.h>



#include <net/netns/generic.h>

#include <linux/netfilter/nf_conntrack_common.h>

#include <linux/netfilter/nf_conntrack_tcp.h>

#include <linux/netfilter/nf_conntrack_sctp.h>

net/netfilter/nf_conntrack_bpf.c

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

#include <linux/btf_ids.h>

#include <linux/net_namespace.h>

#include <net/sock.h>

#include <net/xdp.h>

#include <net/netfilter/nf_conntrack_bpf.h>

#include <net/netfilter/nf_conntrack_core.h>

net/netfilter/nf_conntrack_netlink.c

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



#include <linux/netfilter.h>

#include <net/ipv6.h>

#include <net/netlink.h>

#include <net/sock.h>

#include <net/netfilter/nf_conntrack.h>

net/netfilter/nf_conntrack_proto_gre.c

+2 −0
Original line number Diff line number Diff line
@@ -33,12 +33,14 @@ 
#include <linux/skbuff.h>

#include <linux/slab.h>

#include <net/dst.h>

#include <net/gre.h>

#include <net/net_namespace.h>

#include <net/netns/generic.h>

#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack_helper.h>

#include <net/netfilter/nf_conntrack_core.h>

#include <net/netfilter/nf_conntrack_timeout.h>

#include <net/pptp.h>

#include <linux/netfilter/nf_conntrack_proto_gre.h>

#include <linux/netfilter/nf_conntrack_pptp.h>