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

Commit 4e77be46 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

netfilter: Remove extern from function prototypes 



There are a mix of function prototypes with and without extern
in the kernel sources.  Standardize on not using extern for
function prototypes.

Function prototypes don't need to be written with extern.
extern is assumed by the compiler.  Its use is as unnecessary as
using auto to declare automatic/local variables in a block.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e418f94

include/net/netfilter/ipv4/nf_conntrack_ipv4.h

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4; 
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;



extern int nf_conntrack_ipv4_compat_init(void);

extern void nf_conntrack_ipv4_compat_fini(void);

int nf_conntrack_ipv4_compat_init(void);

void nf_conntrack_ipv4_compat_fini(void);



extern void need_ipv4_conntrack(void);

void need_ipv4_conntrack(void);



#endif /*_NF_CONNTRACK_IPV4_H*/

include/net/netfilter/ipv4/nf_defrag_ipv4.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _NF_DEFRAG_IPV4_H

#define _NF_DEFRAG_IPV4_H



extern void nf_defrag_ipv4_enable(void);

void nf_defrag_ipv4_enable(void);



#endif /* _NF_DEFRAG_IPV4_H */

include/net/netfilter/ipv6/nf_defrag_ipv6.h

+8 −9
Original line number Diff line number Diff line 
#ifndef _NF_DEFRAG_IPV6_H

#define _NF_DEFRAG_IPV6_H



extern void nf_defrag_ipv6_enable(void);

void nf_defrag_ipv6_enable(void);



extern int nf_ct_frag6_init(void);

extern void nf_ct_frag6_cleanup(void);

extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user);

extern void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb,

			       struct net_device *in,

			       struct net_device *out,

int nf_ct_frag6_init(void);

void nf_ct_frag6_cleanup(void);

struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user);

void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb,

			struct net_device *in, struct net_device *out,

			int (*okfn)(struct sk_buff *));



struct inet_frags_ctl;

include/net/netfilter/nf_conntrack.h

+30 −39
Original line number Diff line number Diff line
@@ -139,14 +139,12 @@ static inline struct net *nf_ct_net(const struct nf_conn *ct) 
}



/* Alter reply tuple (maybe alter helper). */

extern void

nf_conntrack_alter_reply(struct nf_conn *ct,

void nf_conntrack_alter_reply(struct nf_conn *ct,

			      const struct nf_conntrack_tuple *newreply);



/* Is this tuple taken? (ignoring any belonging to the given

   conntrack). */

extern int

nf_conntrack_tuple_taken(const struct nf_conntrack_tuple *tuple,

int nf_conntrack_tuple_taken(const struct nf_conntrack_tuple *tuple,

			     const struct nf_conn *ignored_conntrack);



/* Return conntrack_info and tuple hash for given skb. */
@@ -165,37 +163,34 @@ static inline void nf_ct_put(struct nf_conn *ct) 
}



/* Protocol module loading */

extern int nf_ct_l3proto_try_module_get(unsigned short l3proto);

extern void nf_ct_l3proto_module_put(unsigned short l3proto);

int nf_ct_l3proto_try_module_get(unsigned short l3proto);

void nf_ct_l3proto_module_put(unsigned short l3proto);



/*

 * Allocate a hashtable of hlist_head (if nulls == 0),

 * or hlist_nulls_head (if nulls == 1)

 */

extern void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls);

void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls);



extern void nf_ct_free_hashtable(void *hash, unsigned int size);

void nf_ct_free_hashtable(void *hash, unsigned int size);



extern struct nf_conntrack_tuple_hash *

struct nf_conntrack_tuple_hash *

__nf_conntrack_find(struct net *net, u16 zone,

		    const struct nf_conntrack_tuple *tuple);



extern int nf_conntrack_hash_check_insert(struct nf_conn *ct);

int nf_conntrack_hash_check_insert(struct nf_conn *ct);

bool nf_ct_delete(struct nf_conn *ct, u32 pid, int report);



extern void nf_conntrack_flush_report(struct net *net, u32 portid, int report);

void nf_conntrack_flush_report(struct net *net, u32 portid, int report);



extern bool nf_ct_get_tuplepr(const struct sk_buff *skb,

			      unsigned int nhoff, u_int16_t l3num,

			      struct nf_conntrack_tuple *tuple);

extern bool nf_ct_invert_tuplepr(struct nf_conntrack_tuple *inverse,

bool nf_ct_get_tuplepr(const struct sk_buff *skb, unsigned int nhoff,

		       u_int16_t l3num, struct nf_conntrack_tuple *tuple);

bool nf_ct_invert_tuplepr(struct nf_conntrack_tuple *inverse,

			  const struct nf_conntrack_tuple *orig);



extern void __nf_ct_refresh_acct(struct nf_conn *ct,

				 enum ip_conntrack_info ctinfo,

void __nf_ct_refresh_acct(struct nf_conn *ct, enum ip_conntrack_info ctinfo,

			  const struct sk_buff *skb,

				 unsigned long extra_jiffies,

				 int do_acct);

			  unsigned long extra_jiffies, int do_acct);



/* Refresh conntrack for this many jiffies and do accounting */

static inline void nf_ct_refresh_acct(struct nf_conn *ct,
@@ -214,10 +209,8 @@ static inline void nf_ct_refresh(struct nf_conn *ct, 
	__nf_ct_refresh_acct(ct, 0, skb, extra_jiffies, 0);

}



extern bool __nf_ct_kill_acct(struct nf_conn *ct,

			      enum ip_conntrack_info ctinfo,

			      const struct sk_buff *skb,

			      int do_acct);

bool __nf_ct_kill_acct(struct nf_conn *ct, enum ip_conntrack_info ctinfo,

		       const struct sk_buff *skb, int do_acct);



/* kill conntrack and do accounting */

static inline bool nf_ct_kill_acct(struct nf_conn *ct,
@@ -244,16 +237,14 @@ static inline struct nf_conn *nf_ct_untracked_get(void) 
{

	return &__raw_get_cpu_var(nf_conntrack_untracked);

}

extern void nf_ct_untracked_status_or(unsigned long bits);

void nf_ct_untracked_status_or(unsigned long bits);



/* Iterate over all conntracks: if iter returns true, it's deleted. */

extern void

nf_ct_iterate_cleanup(struct net *net,

void nf_ct_iterate_cleanup(struct net *net,

			   int (*iter)(struct nf_conn *i, void *data),

			   void *data, u32 portid, int report);

extern void nf_conntrack_free(struct nf_conn *ct);

extern struct nf_conn *

nf_conntrack_alloc(struct net *net, u16 zone,

void nf_conntrack_free(struct nf_conn *ct);

struct nf_conn *nf_conntrack_alloc(struct net *net, u16 zone,

				   const struct nf_conntrack_tuple *orig,

				   const struct nf_conntrack_tuple *repl,

				   gfp_t gfp);
@@ -287,7 +278,7 @@ static inline bool nf_is_loopback_packet(const struct sk_buff *skb) 


struct kernel_param;



extern int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp);

int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp);

extern unsigned int nf_conntrack_htable_size;

extern unsigned int nf_conntrack_max;

extern unsigned int nf_conntrack_hash_rnd;

include/net/netfilter/nf_conntrack_acct.h

+6 −6
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ struct nf_conn_counter *nf_ct_acct_ext_add(struct nf_conn *ct, gfp_t gfp) 
	return acct;

};



extern unsigned int

seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir);

unsigned int seq_print_acct(struct seq_file *s, const struct nf_conn *ct,

			    int dir);



/* Check if connection tracking accounting is enabled */

static inline bool nf_ct_acct_enabled(struct net *net)
@@ -57,9 +57,9 @@ static inline void nf_ct_set_acct(struct net *net, bool enable) 
	net->ct.sysctl_acct = enable;

}



extern int nf_conntrack_acct_pernet_init(struct net *net);

extern void nf_conntrack_acct_pernet_fini(struct net *net);

int nf_conntrack_acct_pernet_init(struct net *net);

void nf_conntrack_acct_pernet_fini(struct net *net);



extern int nf_conntrack_acct_init(void);

extern void nf_conntrack_acct_fini(void);

int nf_conntrack_acct_init(void);

void nf_conntrack_acct_fini(void);

#endif /* _NF_CONNTRACK_ACCT_H */