From: Adrian Bunk <bunk@stusta.de>
To: sri@us.ibm.com
Cc: lksctp-developers@lists.sourceforge.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
David Woodhouse <dwmw2@infradead.org>
Subject: [2.6 patch] net/sctp/: cleanups
Date: Tue, 5 Sep 2006 23:57:21 +0200 [thread overview]
Message-ID: <20060905215721.GM9173@stusta.de> (raw)
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>
---
include/net/sctp/sctp.h | 13 +++++++++++++
net/sctp/ipv6.c | 1 -
net/sctp/protocol.c | 7 -------
net/sctp/socket.c | 14 +++++++-------
4 files changed, 20 insertions(+), 15 deletions(-)
--- linux-2.6.18-rc5-mm1/include/net/sctp/sctp.h.old 2006-09-05 16:50:33.000000000 +0200
+++ linux-2.6.18-rc5-mm1/include/net/sctp/sctp.h 2006-09-05 16:54:18.000000000 +0200
@@ -128,6 +128,8 @@
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
@@ -178,6 +180,17 @@
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
*/
--- linux-2.6.18-rc5-mm1/net/sctp/socket.c.old 2006-09-05 16:49:15.000000000 +0200
+++ linux-2.6.18-rc5-mm1/net/sctp/socket.c 2006-09-05 16:49:27.000000000 +0200
@@ -2081,13 +2081,13 @@
* SPP_SACKDELAY_ENABLE, setting both will have undefined
* results.
*/
-int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
- struct sctp_transport *trans,
- struct sctp_association *asoc,
- struct sctp_sock *sp,
- int hb_change,
- int pmtud_change,
- int sackdelay_change)
+static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
+ struct sctp_transport *trans,
+ struct sctp_association *asoc,
+ struct sctp_sock *sp,
+ int hb_change,
+ int pmtud_change,
+ int sackdelay_change)
{
int error;
--- linux-2.6.18-rc5-mm1/net/sctp/ipv6.c.old 2006-09-05 16:50:51.000000000 +0200
+++ linux-2.6.18-rc5-mm1/net/sctp/ipv6.c 2006-09-05 16:50:58.000000000 +0200
@@ -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,
};
--- linux-2.6.18-rc5-mm1/net/sctp/protocol.c.old 2006-09-05 16:53:10.000000000 +0200
+++ linux-2.6.18-rc5-mm1/net/sctp/protocol.c 2006-09-05 16:53:20.000000000 +0200
@@ -82,13 +82,6 @@
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)
{
next reply other threads:[~2006-09-05 21:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-05 21:57 Adrian Bunk [this message]
2006-09-05 23:44 ` [2.6 patch] net/sctp/: cleanups Sridhar Samudrala
2006-09-18 7:40 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060905215721.GM9173@stusta.de \
--to=bunk@stusta.de \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lksctp-developers@lists.sourceforge.net \
--cc=netdev@vger.kernel.org \
--cc=sri@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).