Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40d102cd authored by Jeremy Sowden's avatar Jeremy Sowden Committed by Pablo Neira Ayuso
Browse files

netfilter: update include directives. 



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

Signed-off-by: default avatarJeremy Sowden <jeremy@azazel.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 85cfbc25

include/net/netfilter/nf_conntrack_core.h

+2 −1
Original line number Diff line number Diff line
@@ -14,8 +14,9 @@ 
#define _NF_CONNTRACK_CORE_H



#include <linux/netfilter.h>

#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack.h>

#include <net/netfilter/nf_conntrack_ecache.h>

#include <net/netfilter/nf_conntrack_l4proto.h>



/* This header is used to share core functionality between the

   standalone connection tracking module, and the compatibility layer's use

include/net/netfilter/nf_conntrack_zones.h

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
#include <linux/netfilter/nf_conntrack_zones_common.h>



#if IS_ENABLED(CONFIG_NF_CONNTRACK)

#include <net/netfilter/nf_conntrack_extend.h>



#include <net/netfilter/nf_conntrack.h>



static inline const struct nf_conntrack_zone *

nf_ct_zone(const struct nf_conn *ct)

include/net/netfilter/nf_nat.h

+6 −7
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _NF_NAT_H

#define _NF_NAT_H



#include <linux/list.h>

#include <linux/netfilter_ipv4.h>

#include <linux/netfilter/nf_nat.h>

#include <linux/netfilter/nf_conntrack_pptp.h>

#include <net/netfilter/nf_conntrack.h>

#include <net/netfilter/nf_conntrack_extend.h>

#include <net/netfilter/nf_conntrack_tuple.h>

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



enum nf_nat_manip_type {

	NF_NAT_MANIP_SRC,
@@ -14,10 +19,6 @@ enum nf_nat_manip_type { 
#define HOOK2MANIP(hooknum) ((hooknum) != NF_INET_POST_ROUTING && \

			     (hooknum) != NF_INET_LOCAL_IN)



#include <linux/list.h>

#include <linux/netfilter/nf_conntrack_pptp.h>

#include <net/netfilter/nf_conntrack_extend.h>



/* per conntrack: nat application helper private data */

union nf_conntrack_nat_help {

	/* insert nat helper private data here */
@@ -26,8 +27,6 @@ union nf_conntrack_nat_help { 
#endif

};



struct nf_conn;



/* The structure embedded in the conntrack structure. */

struct nf_conn_nat {

	union nf_conntrack_nat_help help;

include/net/netfilter/nf_nat_masquerade.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef _NF_NAT_MASQUERADE_H_

#define _NF_NAT_MASQUERADE_H_



#include <linux/skbuff.h>

#include <net/netfilter/nf_nat.h>



unsigned int

net/bridge/netfilter/nf_conntrack_bridge.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <net/netfilter/nf_conntrack_bridge.h>



#include <linux/netfilter/nf_tables.h>

#include <net/netfilter/ipv6/nf_defrag_ipv6.h>

#include <net/netfilter/nf_tables.h>



#include "../br_private.h"