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[] = { {