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

Commit a0f4ecf3 authored by Joe Perches's avatar Joe Perches
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>
parent aae8c287

include/linux/netfilter.h

+5 −5
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline void nf_inet_addr_mask(const union nf_inet_addr *a1, 
	result->all[3] = a1->all[3] & mask->all[3];

}



extern int netfilter_init(void);

int netfilter_init(void);



/* Largest hook number + 1 */

#define NF_MAX_HOOKS 8
@@ -208,7 +208,7 @@ int compat_nf_getsockopt(struct sock *sk, u_int8_t pf, int optval, 
/* Call this before modifying an existing packet: ensures it is

   modifiable and linear to the point you care about (writable_len).

   Returns true or false. */

extern int skb_make_writable(struct sk_buff *skb, unsigned int writable_len);

int skb_make_writable(struct sk_buff *skb, unsigned int writable_len);



struct flowi;

struct nf_queue_entry;
@@ -269,8 +269,8 @@ nf_checksum_partial(struct sk_buff *skb, unsigned int hook, 
	return csum;

}



extern int nf_register_afinfo(const struct nf_afinfo *afinfo);

extern void nf_unregister_afinfo(const struct nf_afinfo *afinfo);

int nf_register_afinfo(const struct nf_afinfo *afinfo);

void nf_unregister_afinfo(const struct nf_afinfo *afinfo);



#include <net/flow.h>

extern void (*nf_nat_decode_session_hook)(struct sk_buff *, struct flowi *);
@@ -315,7 +315,7 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family) 


#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

extern void (*ip_ct_attach)(struct sk_buff *, const struct sk_buff *) __rcu;

extern void nf_ct_attach(struct sk_buff *, const struct sk_buff *);

void nf_ct_attach(struct sk_buff *, const struct sk_buff *);

extern void (*nf_ct_destroy)(struct nf_conntrack *) __rcu;



struct nf_conn;

include/linux/netfilter/nf_conntrack_common.h

+1 −1
Original line number Diff line number Diff line
@@ -23,6 +23,6 @@ struct ip_conntrack_stat { 
};



/* call to create an explicit dependency on nf_conntrack. */

extern void need_conntrack(void);

void need_conntrack(void);



#endif /* _NF_CONNTRACK_COMMON_H */

include/linux/netfilter/nf_conntrack_h323.h

+7 −7
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ struct nf_ct_h323_master { 


struct nf_conn;



extern int get_h225_addr(struct nf_conn *ct, unsigned char *data,

			 TransportAddress *taddr,

			 union nf_inet_addr *addr, __be16 *port);

extern void nf_conntrack_h245_expect(struct nf_conn *new,

int get_h225_addr(struct nf_conn *ct, unsigned char *data,

		  TransportAddress *taddr, union nf_inet_addr *addr,

		  __be16 *port);

void nf_conntrack_h245_expect(struct nf_conn *new,

			      struct nf_conntrack_expect *this);

extern void nf_conntrack_q931_expect(struct nf_conn *new,

void nf_conntrack_q931_expect(struct nf_conn *new,

			      struct nf_conntrack_expect *this);

extern int (*set_h245_addr_hook) (struct sk_buff *skb, unsigned int protoff,

				  unsigned char **data, int dataoff,

include/linux/netfilter/nf_conntrack_proto_gre.h

+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir, 
/* delete keymap entries */

void nf_ct_gre_keymap_destroy(struct nf_conn *ct);



extern void nf_ct_gre_keymap_flush(struct net *net);

extern void nf_nat_need_gre(void);

void nf_ct_gre_keymap_flush(struct net *net);

void nf_nat_need_gre(void);



#endif /* __KERNEL__ */

#endif /* _CONNTRACK_PROTO_GRE_H */

include/linux/netfilter/nf_conntrack_sip.h

+28 −29
Original line number Diff line number Diff line
@@ -157,31 +157,30 @@ extern unsigned int (*nf_nat_sdp_media_hook)(struct sk_buff *skb, 
					     unsigned int medialen,

					     union nf_inet_addr *rtp_addr);



extern int ct_sip_parse_request(const struct nf_conn *ct,

				const char *dptr, unsigned int datalen,

				unsigned int *matchoff, unsigned int *matchlen,

				union nf_inet_addr *addr, __be16 *port);

extern int ct_sip_get_header(const struct nf_conn *ct, const char *dptr,

int ct_sip_parse_request(const struct nf_conn *ct, const char *dptr,

			 unsigned int datalen, unsigned int *matchoff,

			 unsigned int *matchlen, union nf_inet_addr *addr,

			 __be16 *port);

int ct_sip_get_header(const struct nf_conn *ct, const char *dptr,

		      unsigned int dataoff, unsigned int datalen,

			     enum sip_header_types type,

			     unsigned int *matchoff, unsigned int *matchlen);

extern int ct_sip_parse_header_uri(const struct nf_conn *ct, const char *dptr,

		      enum sip_header_types type, unsigned int *matchoff,

		      unsigned int *matchlen);

int ct_sip_parse_header_uri(const struct nf_conn *ct, const char *dptr,

			    unsigned int *dataoff, unsigned int datalen,

			    enum sip_header_types type, int *in_header,

			    unsigned int *matchoff, unsigned int *matchlen,

			    union nf_inet_addr *addr, __be16 *port);

extern int ct_sip_parse_address_param(const struct nf_conn *ct, const char *dptr,

int ct_sip_parse_address_param(const struct nf_conn *ct, const char *dptr,

			       unsigned int dataoff, unsigned int datalen,

				      const char *name,

				      unsigned int *matchoff, unsigned int *matchlen,

				      union nf_inet_addr *addr, bool delim);

extern int ct_sip_parse_numerical_param(const struct nf_conn *ct, const char *dptr,

			       const char *name, unsigned int *matchoff,

			       unsigned int *matchlen, union nf_inet_addr *addr,

			       bool delim);

int ct_sip_parse_numerical_param(const struct nf_conn *ct, const char *dptr,

				 unsigned int off, unsigned int datalen,

					const char *name,

					unsigned int *matchoff, unsigned int *matchen,

					unsigned int *val);

				 const char *name, unsigned int *matchoff,

				 unsigned int *matchen, unsigned int *val);



extern int ct_sip_get_sdp_header(const struct nf_conn *ct, const char *dptr,

int ct_sip_get_sdp_header(const struct nf_conn *ct, const char *dptr,

			  unsigned int dataoff, unsigned int datalen,

			  enum sdp_header_types type,

			  enum sdp_header_types term,