* [PATCH for 2.6.24] SCTP: Move sysctl_sctp_[rw]mem definitions to protocol.c
@ 2007-09-13 21:03 Vlad Yasevich
2007-09-16 23:05 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Vlad Yasevich @ 2007-09-13 21:03 UTC (permalink / raw)
To: netdev; +Cc: lksctp-developers@lists.sourceforge.net, David Miller
The sctp_[rw]mem definitions should really be in protocol.c
since that is where they are initialized. This also allows
one to build a kernel without sysctl support.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
---
net/sctp/protocol.c | 6 +++---
net/sctp/sysctl.c | 11 +++--------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 193835d..c49eb99 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -84,9 +84,9 @@ static struct sctp_af *sctp_af_v6_specific;
struct kmem_cache *sctp_chunk_cachep __read_mostly;
struct kmem_cache *sctp_bucket_cachep __read_mostly;
-extern int sysctl_sctp_mem[3];
-extern int sysctl_sctp_rmem[3];
-extern int sysctl_sctp_wmem[3];
+int sysctl_sctp_mem[3];
+int sysctl_sctp_rmem[3];
+int sysctl_sctp_wmem[3];
/* Return the address of the control sock. */
struct sock *sctp_get_ctl_sock(void)
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index ba75ef4..39b10ee 100644
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -52,14 +52,9 @@ static int int_max = INT_MAX;
static long sack_timer_min = 1;
static long sack_timer_max = 500;
-int sysctl_sctp_mem[3];
-int sysctl_sctp_rmem[3];
-int sysctl_sctp_wmem[3];
-
-/*
- * per assoc memory limitationf for sends
- */
-int sysctl_sctp_wmem[3];
+extern int sysctl_sctp_mem[3];
+extern int sysctl_sctp_rmem[3];
+extern int sysctl_sctp_wmem[3];
static ctl_table sctp_table[] = {
{
--
1.5.2.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH for 2.6.24] SCTP: Move sysctl_sctp_[rw]mem definitions to protocol.c
2007-09-13 21:03 [PATCH for 2.6.24] SCTP: Move sysctl_sctp_[rw]mem definitions to protocol.c Vlad Yasevich
@ 2007-09-16 23:05 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2007-09-16 23:05 UTC (permalink / raw)
To: vladislav.yasevich; +Cc: netdev, lksctp-developers
From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Thu, 13 Sep 2007 17:03:45 -0400
> The sctp_[rw]mem definitions should really be in protocol.c
> since that is where they are initialized. This also allows
> one to build a kernel without sysctl support.
>
> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Applied to net-2.6.24, thanks Vlad.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-09-16 23:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-13 21:03 [PATCH for 2.6.24] SCTP: Move sysctl_sctp_[rw]mem definitions to protocol.c Vlad Yasevich
2007-09-16 23:05 ` David Miller
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).