Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 007e3936 authored Sep 16, 2007 by Vlad Yasevich Committed by David S. Miller Oct 10, 2007

[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>

parent 131a47e3

net/sctp/protocol.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -84,9 +84,9 @@ static struct sctp_af *sctp_af_v6_specific;
	struct kmem_cache *sctp_chunk_cachep __read_mostly;		struct kmem_cache *sctp_chunk_cachep __read_mostly;
	struct kmem_cache *sctp_bucket_cachep __read_mostly;		struct kmem_cache *sctp_bucket_cachep __read_mostly;

	extern int sysctl_sctp_mem[3];		int sysctl_sctp_mem[3];
	extern int sysctl_sctp_rmem[3];		int sysctl_sctp_rmem[3];
	extern int sysctl_sctp_wmem[3];		int sysctl_sctp_wmem[3];

	/* Return the address of the control sock. */		/* Return the address of the control sock. */
	struct sock *sctp_get_ctl_sock(void)		struct sock *sctp_get_ctl_sock(void)

net/sctp/sysctl.c

+3 −8

Original line number	Original line	Diff line number	Diff line
	@@ -52,14 +52,9 @@ static int int_max = INT_MAX;
	static long sack_timer_min = 1;		static long sack_timer_min = 1;
	static long sack_timer_max = 500;		static long sack_timer_max = 500;

	int sysctl_sctp_mem[3];		extern int sysctl_sctp_mem[3];
	int sysctl_sctp_rmem[3];		extern int sysctl_sctp_rmem[3];
	int sysctl_sctp_wmem[3];		extern int sysctl_sctp_wmem[3];

	/*
	* per assoc memory limitationf for sends
	*/
	int sysctl_sctp_wmem[3];

	static ctl_table sctp_table[] = {		static ctl_table sctp_table[] = {
	{		{