From a252e749f1ae17e43ccc5824f7b1b5854417c98b Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 8 Dec 2009 12:51:22 -0800 Subject: [PATCH] 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 Reported-by: Ingo Molnar Signed-off-by: Linus Torvalds --- net/sctp/sysctl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c index 419e1e9..832590b 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c @@ -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, }, -- 1.8.2.3