Commit 16164366 authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

[SCTP]: Cleanups 



This patch contains the following cleanups:
- make the following needlessly global function static:
  - socket.c: sctp_apply_peer_addr_params()
- add proper prototypes for the several global functions in
  include/net/sctp/sctp.h

Note that this fixes wrong prototypes for the following functions:
- sctp_snmp_proc_exit()
- sctp_eps_proc_exit()
- sctp_assocs_proc_exit()

The latter was spotted by the GNU C compiler and reported
by David Woodhouse.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarSridhar Samudrala <sri@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7198f8ce

include/net/sctp/sctp.h

+13 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ extern int sctp_copy_local_addr_list(struct sctp_bind_addr *, 
				     int flags);

extern struct sctp_pf *sctp_get_pf_specific(sa_family_t family);

extern int sctp_register_pf(struct sctp_pf *, sa_family_t);

int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,

                        void *ptr);



/*

 * sctp/socket.c
@@ -177,6 +179,17 @@ void sctp_icmp_proto_unreachable(struct sock *sk, 
void sctp_backlog_migrate(struct sctp_association *assoc,

			  struct sock *oldsk, struct sock *newsk);



/*

 * sctp/proc.c

 */

int sctp_snmp_proc_init(void);

void sctp_snmp_proc_exit(void);

int sctp_eps_proc_init(void);

void sctp_eps_proc_exit(void);

int sctp_assocs_proc_init(void);

void sctp_assocs_proc_exit(void);





/*

 *  Section:  Macros, externs, and inlines

 */

net/sctp/ipv6.c

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ 


#include <asm/uaccess.h>



extern int sctp_inetaddr_event(struct notifier_block *, unsigned long, void *);

static struct notifier_block sctp_inet6addr_notifier = {

	.notifier_call = sctp_inetaddr_event,

};

net/sctp/protocol.c

+0 −7
Original line number Diff line number Diff line
@@ -82,13 +82,6 @@ static struct sctp_af *sctp_af_v6_specific; 
kmem_cache_t *sctp_chunk_cachep __read_mostly;

kmem_cache_t *sctp_bucket_cachep __read_mostly;



extern int sctp_snmp_proc_init(void);

extern int sctp_snmp_proc_exit(void);

extern int sctp_eps_proc_init(void);

extern int sctp_eps_proc_exit(void);

extern int sctp_assocs_proc_init(void);

extern int sctp_assocs_proc_exit(void);



/* Return the address of the control sock. */

struct sock *sctp_get_ctl_sock(void)

{

net/sctp/socket.c

+7 −7
Original line number Diff line number Diff line
@@ -2081,7 +2081,7 @@ static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval, 
 *                     SPP_SACKDELAY_ENABLE, setting both will have undefined

 *                     results.

 */

int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,

static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,

				       struct sctp_transport   *trans,

				       struct sctp_association *asoc,

				       struct sctp_sock        *sp,

CRA Git | Maintained and supported by SUSTech CRA and CCSE