Commit a252e749 authored Dec 08, 2009 by Linus Torvalds

sctp: fix compile error due to sysctl mismerge



I messed up the merge in d7fc02c7, 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>

parent 6035ccd8

net/sctp/sysctl.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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,
		},