The following commit has been merged in the batman-adv/next branch: commit 02644a17457414f38e29f32d5c640b06d08fa092 Author: Dan Carpenter dan.carpenter@oracle.com Date: Thu Aug 16 03:16:19 2012 +0000

sctp: fix bogus if statement in sctp_auth_recv_cid()

There is an extra semi-colon here, so we always return 0 instead of calling __sctp_auth_cid().

Signed-off-by: Dan Carpenter dan.carpenter@oracle.com Reviewed-by: "Eric W. Biederman" ebiederm@xmission.com Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/net/sctp/auth.c b/net/sctp/auth.c index aaa6c12..159b9bc 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c @@ -695,7 +695,7 @@ int sctp_auth_recv_cid(sctp_cid_t chunk, const struct sctp_association *asoc) return 0;

net = sock_net(asoc->base.sk); - if (!net->sctp.auth_enable); + if (!net->sctp.auth_enable) return 0;

return __sctp_auth_cid(chunk,