aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-09-18 03:40:38 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 18:19:03 -0400
commit161643660129dd7d98f0b12418c0a2710ffa7db6 (patch)
treee14d0bb1429cd2263a1026e204f2b6fc786249bb /net
parent7198f8cec12ccec6d6f2e18c08ecc8c66c8aaf93 (diff)
[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: Adrian Bunk <bunk@stusta.de> Acked-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sctp/ipv6.c1
-rw-r--r--net/sctp/protocol.c7
-rw-r--r--net/sctp/socket.c14
3 files changed, 7 insertions, 15 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 99c0cefc04e0..fd87e3ceb56e 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -78,7 +78,6 @@
78 78
79#include <asm/uaccess.h> 79#include <asm/uaccess.h>
80 80
81extern int sctp_inetaddr_event(struct notifier_block *, unsigned long, void *);
82static struct notifier_block sctp_inet6addr_notifier = { 81static struct notifier_block sctp_inet6addr_notifier = {
83 .notifier_call = sctp_inetaddr_event, 82 .notifier_call = sctp_inetaddr_event,
84}; 83};
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index d9dd4c47bc29..fac7674438a4 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -82,13 +82,6 @@ static struct sctp_af *sctp_af_v6_specific;
82kmem_cache_t *sctp_chunk_cachep __read_mostly; 82kmem_cache_t *sctp_chunk_cachep __read_mostly;
83kmem_cache_t *sctp_bucket_cachep __read_mostly; 83kmem_cache_t *sctp_bucket_cachep __read_mostly;
84 84
85extern int sctp_snmp_proc_init(void);
86extern int sctp_snmp_proc_exit(void);
87extern int sctp_eps_proc_init(void);
88extern int sctp_eps_proc_exit(void);
89extern int sctp_assocs_proc_init(void);
90extern int sctp_assocs_proc_exit(void);
91
92/* Return the address of the control sock. */ 85/* Return the address of the control sock. */
93struct sock *sctp_get_ctl_sock(void) 86struct sock *sctp_get_ctl_sock(void)
94{ 87{
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 7c1dbb1d10df..79c3e072cf28 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -2081,13 +2081,13 @@ static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval,
2081 * SPP_SACKDELAY_ENABLE, setting both will have undefined 2081 * SPP_SACKDELAY_ENABLE, setting both will have undefined
2082 * results. 2082 * results.
2083 */ 2083 */
2084int sctp_apply_peer_addr_params(struct sctp_paddrparams *params, 2084static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
2085 struct sctp_transport *trans, 2085 struct sctp_transport *trans,
2086 struct sctp_association *asoc, 2086 struct sctp_association *asoc,
2087 struct sctp_sock *sp, 2087 struct sctp_sock *sp,
2088 int hb_change, 2088 int hb_change,
2089 int pmtud_change, 2089 int pmtud_change,
2090 int sackdelay_change) 2090 int sackdelay_change)
2091{ 2091{
2092 int error; 2092 int error;
2093 2093