From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Dec 2009 20:51:22 +0000 (-0800)
Subject: sctp: fix compile error due to sysctl mismerge
X-Git-Tag: MMI-PSA29.97-13-9~25744
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a252e749f1ae17e43ccc5824f7b1b5854417c98b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

sctp: fix compile error due to sysctl mismerge

I messed up the merge in d7fc02c7bae7b1cf69269992cf880a43a350cdaa, where
the conflict in question wasn't just about CTL_UNNUMBERED being removed,
but the 'strategy' field is too (sysctl handling is now done through the
/proc interface, with no duplicate protocols for reading the data).

Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index 419e1e962c55..832590bbe0c0 100644
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -248,7 +248,6 @@ static ctl_table sctp_table[] = {
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
 		.proc_handler	= &proc_dointvec_minmax,
-		.strategy	= &sysctl_intvec,
 		.extra1		= &one,
 		.extra2		= &rwnd_scale_max,
 	},