sctp: fix compile error due to sysctl mismerge
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 20:51:22 +0000 (12:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 20:51:22 +0000 (12:51 -0800)
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>
net/sctp/sysctl.c

index 419e1e962c55a06012133252c8e04958465ed915..832590bbe0c046ec83fcb58af7c98605fefec342 100644 (file)
@@ -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,
        },