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

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

net: misc: 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 7e58487b

net/irda/irnet/irnet.h

+5 −10
Original line number Diff line number Diff line
@@ -509,16 +509,11 @@ typedef struct irnet_ctrl_channel 
 */



/* -------------------------- IRDA PART -------------------------- */

extern int

	irda_irnet_create(irnet_socket *);	/* Initialise a IrNET socket */

extern int

	irda_irnet_connect(irnet_socket *);	/* Try to connect over IrDA */

extern void

	irda_irnet_destroy(irnet_socket *);	/* Teardown  a IrNET socket */

extern int

	irda_irnet_init(void);		/* Initialise IrDA part of IrNET */

extern void

	irda_irnet_cleanup(void);	/* Teardown IrDA part of IrNET */

int irda_irnet_create(irnet_socket *);	/* Initialise an IrNET socket */

int irda_irnet_connect(irnet_socket *);	/* Try to connect over IrDA */

void irda_irnet_destroy(irnet_socket *);	/* Teardown an IrNET socket */

int irda_irnet_init(void);		/* Initialise IrDA part of IrNET */

void irda_irnet_cleanup(void);		/* Teardown IrDA part of IrNET */



/**************************** VARIABLES ****************************/

net/l2tp/l2tp_core.h

+34 −23
Original line number Diff line number Diff line
@@ -238,29 +238,40 @@ static inline struct l2tp_tunnel *l2tp_sock_to_tunnel(struct sock *sk) 
	return tunnel;

}



extern struct sock *l2tp_tunnel_sock_lookup(struct l2tp_tunnel *tunnel);

extern void l2tp_tunnel_sock_put(struct sock *sk);

extern struct l2tp_session *l2tp_session_find(struct net *net, struct l2tp_tunnel *tunnel, u32 session_id);

extern struct l2tp_session *l2tp_session_find_nth(struct l2tp_tunnel *tunnel, int nth);

extern struct l2tp_session *l2tp_session_find_by_ifname(struct net *net, char *ifname);

extern struct l2tp_tunnel *l2tp_tunnel_find(struct net *net, u32 tunnel_id);

extern struct l2tp_tunnel *l2tp_tunnel_find_nth(struct net *net, int nth);



extern int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32 peer_tunnel_id, struct l2tp_tunnel_cfg *cfg, struct l2tp_tunnel **tunnelp);

extern void l2tp_tunnel_closeall(struct l2tp_tunnel *tunnel);

extern int l2tp_tunnel_delete(struct l2tp_tunnel *tunnel);

extern struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunnel, u32 session_id, u32 peer_session_id, struct l2tp_session_cfg *cfg);

extern void __l2tp_session_unhash(struct l2tp_session *session);

extern int l2tp_session_delete(struct l2tp_session *session);

extern void l2tp_session_free(struct l2tp_session *session);

extern void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb, unsigned char *ptr, unsigned char *optr, u16 hdrflags, int length, int (*payload_hook)(struct sk_buff *skb));

extern int l2tp_session_queue_purge(struct l2tp_session *session);

extern int l2tp_udp_encap_recv(struct sock *sk, struct sk_buff *skb);



extern int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len);



extern int l2tp_nl_register_ops(enum l2tp_pwtype pw_type, const struct l2tp_nl_cmd_ops *ops);

extern void l2tp_nl_unregister_ops(enum l2tp_pwtype pw_type);

struct sock *l2tp_tunnel_sock_lookup(struct l2tp_tunnel *tunnel);

void l2tp_tunnel_sock_put(struct sock *sk);

struct l2tp_session *l2tp_session_find(struct net *net,

				       struct l2tp_tunnel *tunnel,

				       u32 session_id);

struct l2tp_session *l2tp_session_find_nth(struct l2tp_tunnel *tunnel, int nth);

struct l2tp_session *l2tp_session_find_by_ifname(struct net *net, char *ifname);

struct l2tp_tunnel *l2tp_tunnel_find(struct net *net, u32 tunnel_id);

struct l2tp_tunnel *l2tp_tunnel_find_nth(struct net *net, int nth);



int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id,

		       u32 peer_tunnel_id, struct l2tp_tunnel_cfg *cfg,

		       struct l2tp_tunnel **tunnelp);

void l2tp_tunnel_closeall(struct l2tp_tunnel *tunnel);

int l2tp_tunnel_delete(struct l2tp_tunnel *tunnel);

struct l2tp_session *l2tp_session_create(int priv_size,

					 struct l2tp_tunnel *tunnel,

					 u32 session_id, u32 peer_session_id,

					 struct l2tp_session_cfg *cfg);

void __l2tp_session_unhash(struct l2tp_session *session);

int l2tp_session_delete(struct l2tp_session *session);

void l2tp_session_free(struct l2tp_session *session);

void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,

		      unsigned char *ptr, unsigned char *optr, u16 hdrflags,

		      int length, int (*payload_hook)(struct sk_buff *skb));

int l2tp_session_queue_purge(struct l2tp_session *session);

int l2tp_udp_encap_recv(struct sock *sk, struct sk_buff *skb);



int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb,

		  int hdr_len);



int l2tp_nl_register_ops(enum l2tp_pwtype pw_type,

			 const struct l2tp_nl_cmd_ops *ops);

void l2tp_nl_unregister_ops(enum l2tp_pwtype pw_type);



/* Session reference counts. Incremented when code obtains a reference

 * to a session.

net/mac80211/rate.h

+6 −6
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ void rate_control_deinitialize(struct ieee80211_local *local); 


/* Rate control algorithms */

#ifdef CONFIG_MAC80211_RC_PID

extern int rc80211_pid_init(void);

extern void rc80211_pid_exit(void);

int rc80211_pid_init(void);

void rc80211_pid_exit(void);

#else

static inline int rc80211_pid_init(void)

{
@@ -157,8 +157,8 @@ static inline void rc80211_pid_exit(void) 
#endif



#ifdef CONFIG_MAC80211_RC_MINSTREL

extern int rc80211_minstrel_init(void);

extern void rc80211_minstrel_exit(void);

int rc80211_minstrel_init(void);

void rc80211_minstrel_exit(void);

#else

static inline int rc80211_minstrel_init(void)

{
@@ -170,8 +170,8 @@ static inline void rc80211_minstrel_exit(void) 
#endif



#ifdef CONFIG_MAC80211_RC_MINSTREL_HT

extern int rc80211_minstrel_ht_init(void);

extern void rc80211_minstrel_ht_exit(void);

int rc80211_minstrel_ht_init(void);

void rc80211_minstrel_ht_exit(void);

#else

static inline int rc80211_minstrel_ht_init(void)

{

net/netfilter/nf_internals.h

+11 −17
Original line number Diff line number Diff line
@@ -13,26 +13,20 @@ 




/* core.c */

extern unsigned int nf_iterate(struct list_head *head,

				struct sk_buff *skb,

				unsigned int hook,

				const struct net_device *indev,

unsigned int nf_iterate(struct list_head *head, struct sk_buff *skb,

			unsigned int hook, const struct net_device *indev,

			const struct net_device *outdev,

			struct nf_hook_ops **elemp,

				int (*okfn)(struct sk_buff *),

				int hook_thresh);

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



/* nf_queue.c */

extern int nf_queue(struct sk_buff *skb,

		    struct nf_hook_ops *elem,

		    u_int8_t pf, unsigned int hook,

		    struct net_device *indev,

		    struct net_device *outdev,

		    int (*okfn)(struct sk_buff *),

int nf_queue(struct sk_buff *skb, struct nf_hook_ops *elem, u_int8_t pf,

	     unsigned int hook, struct net_device *indev,

	     struct net_device *outdev, int (*okfn)(struct sk_buff *),

	     unsigned int queuenum);

extern int __init netfilter_queue_init(void);

int __init netfilter_queue_init(void);



/* nf_log.c */

extern int __init netfilter_log_init(void);

int __init netfilter_log_init(void);



#endif

net/rds/rds.h

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ void rds_atomic_send_complete(struct rds_message *rm, int wc_status); 
int rds_cmsg_atomic(struct rds_sock *rs, struct rds_message *rm,

		    struct cmsghdr *cmsg);



extern void __rds_put_mr_final(struct rds_mr *mr);

void __rds_put_mr_final(struct rds_mr *mr);

static inline void rds_mr_put(struct rds_mr *mr)

{

	if (atomic_dec_and_test(&mr->r_refcount))