Skip to content

Commit

Permalink
sctp: fix compile error due to sysctl mismerge
Browse files Browse the repository at this point in the history
I messed up the merge in d7fc02c, 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 <[email protected]>
Reported-by: Ingo Molnar <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
torvalds committed Dec 8, 2009
1 parent 6035ccd commit a252e74
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion net/sctp/sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down

0 comments on commit a252e74

Please sign in to comment.