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

Commit 20a9379d authored by Jeremy Sowden's avatar Jeremy Sowden Committed by Pablo Neira Ayuso
Browse files

netfilter: remove "#ifdef __KERNEL__" guards from some headers. 



A number of non-UAPI Netfilter header-files contained superfluous
"#ifdef __KERNEL__" guards.  Removed them.

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

include/linux/netfilter/nf_conntrack_dccp.h

+0 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ enum ct_dccp_roles { 
};

#define CT_DCCP_ROLE_MAX	(__CT_DCCP_ROLE_MAX - 1)



#ifdef __KERNEL__

#include <linux/netfilter/nf_conntrack_tuple_common.h>



struct nf_ct_dccp {
@@ -36,6 +35,4 @@ struct nf_ct_dccp { 
	u_int64_t	handshake_seq;

};



#endif /* __KERNEL__ */



#endif /* _NF_CONNTRACK_DCCP_H */

include/linux/netfilter/nf_conntrack_h323.h

+0 −4
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef _NF_CONNTRACK_H323_H

#define _NF_CONNTRACK_H323_H



#ifdef __KERNEL__



#include <linux/netfilter.h>

#include <linux/skbuff.h>

#include <linux/types.h>
@@ -97,5 +95,3 @@ extern int (*nat_q931_hook) (struct sk_buff *skb, struct nf_conn *ct, 
			     struct nf_conntrack_expect *exp);



#endif
 


#endif

include/linux/netfilter/nf_conntrack_irc.h

+0 −3
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef _NF_CONNTRACK_IRC_H

#define _NF_CONNTRACK_IRC_H



#ifdef __KERNEL__



#include <linux/netfilter.h>

#include <linux/skbuff.h>

#include <net/netfilter/nf_conntrack_expect.h>
@@ -17,5 +15,4 @@ extern unsigned int (*nf_nat_irc_hook)(struct sk_buff *skb, 
				       unsigned int matchlen,

				       struct nf_conntrack_expect *exp);



#endif /* __KERNEL__ */

#endif /* _NF_CONNTRACK_IRC_H */

include/linux/netfilter/nf_conntrack_pptp.h

+0 −3
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ struct nf_nat_pptp { 
	__be16 pac_call_id;			/* NAT'ed PAC call id */

};



#ifdef __KERNEL__



#define PPTP_CONTROL_PORT	1723



#define PPTP_PACKET_CONTROL	1
@@ -324,5 +322,4 @@ extern void 
(*nf_nat_pptp_hook_expectfn)(struct nf_conn *ct,

			     struct nf_conntrack_expect *exp);



#endif /* __KERNEL__ */

#endif /* _NF_CONNTRACK_PPTP_H */

include/linux/netfilter/nf_conntrack_proto_gre.h

+0 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ struct nf_ct_gre { 
	unsigned int timeout;

};



#ifdef __KERNEL__

#include <net/netfilter/nf_conntrack_tuple.h>



struct nf_conn;
@@ -32,5 +31,4 @@ void nf_ct_gre_keymap_destroy(struct nf_conn *ct); 


bool gre_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,

		      struct net *net, struct nf_conntrack_tuple *tuple);

#endif /* __KERNEL__ */

#endif /* _CONNTRACK_PROTO_GRE_H */