diff options
| author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2007-09-16 16:04:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:51:23 -0700 |
| commit | 007e3936bdaaa012483c9fe06ca71c272458c710 (patch) | |
| tree | 04fd9f1b95f7f55826aa1c9df30a93e2170274d1 | |
| parent | 131a47e31ab1a9defd50ff16b04008ab94c21c0d (diff) | |
| download | linux-3.10-007e3936bdaaa012483c9fe06ca71c272458c710.tar.gz linux-3.10-007e3936bdaaa012483c9fe06ca71c272458c710.tar.bz2 linux-3.10-007e3936bdaaa012483c9fe06ca71c272458c710.zip | |
[SCTP]: Move sysctl_sctp_[rw]mem definitions to protocol.c
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sctp/protocol.c | 6 | ||||
| -rw-r--r-- | 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 54edcd978f7..3ec8b12b6da 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 ba75ef4669e..39b10ee2f01 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[] = { { |