lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sctp: fix compile error due to sysctl mismerge

Browse Source 
I messed up the merge in d7fc02c7ba, 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>
This commit is contained in:
Linus Torvalds
2009-12-08 12:51:22 -08:00
parent 6035ccd8e9
commit a252e749f1
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/sctp/sysctl.c
View File

@@ -248,7 +248,6 @@ static ctl_table sctp_table[] = {
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = &proc_dointvec_minmax,
.strategy = &sysctl_intvec,
.extra1 = &one, .extra1 = &one,
.extra2 = &rwnd_scale_max, .extra2 = &rwnd_scale_max,
}, },