From a5635ddcd7b04430570ac25fe4dd41f53060d6b0 Mon Sep 17 00:00:00 2001
From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Sun, 16 Sep 2007 16:04:37 -0700
Subject: [PATCH] --- yaml --- r: 66607 b: refs/heads/master c:
 007e3936bdaaa012483c9fe06ca71c272458c710 h: refs/heads/master i:   66605:
 9b8777e2699fe4a762df746fedf16415dab4688f   66603:
 21440b674addbae40f944ac72e32c30302e84178   66599:
 e64c3eddabdf68138a7e96c7fecc79982edabcee   66591:
 6d5ab928a0242b6da0b5c28939a8a4dc915a458e v: v3

---
 [refs]                    |  2 +-
 trunk/net/sctp/protocol.c |  6 +++---
 trunk/net/sctp/sysctl.c   | 11 +++--------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 66228ce7aa22..0eae5d6a6c0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 131a47e31ab1a9defd50ff16b04008ab94c21c0d
+refs/heads/master: 007e3936bdaaa012483c9fe06ca71c272458c710
diff --git a/trunk/net/sctp/protocol.c b/trunk/net/sctp/protocol.c
index 54edcd978f75..3ec8b12b6da4 100644
--- a/trunk/net/sctp/protocol.c
+++ b/trunk/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/trunk/net/sctp/sysctl.c b/trunk/net/sctp/sysctl.c
index ba75ef4669e3..39b10ee2f017 100644
--- a/trunk/net/sctp/sysctl.c
+++ b/trunk/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[] = {
 	{