Commit a252e749f1ae17e43ccc5824f7b1b5854417c98b

Authored by Linus Torvalds
1 parent 6035ccd8e9

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>

Showing 1 changed file with 0 additions and 1 deletions Side-by-side Diff

... ... @@ -248,7 +248,6 @@
248 248 .maxlen = sizeof(int),
249 249 .mode = 0644,
250 250 .proc_handler = &proc_dointvec_minmax,
251   - .strategy = &sysctl_intvec,
252 251 .extra1 = &one,
253 252 .extra2 = &rwnd_scale_max,
254 253 },