]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc382a4ee68d08196c13d501ea663169271b58d48
tree0398ece85ef2e5ec63780ec892921a589e7a4d71
parentd19f14eea194af0bb7123ab29c886640da7d4ae1
sctp: fix compile error due to sysctl mismerge

I messed up the merge in 5cdb11e18250b517f32069047374a481fc50a39a, 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