Fix sctp_primitive_ABORT() call in sctp_close()
With the recent fix, the callers of sctp_primitive_ABORT() need to create an ABORT chunk and pass it as an argument rather than msghdr that was passed earlier. Adrian Bunk: Ported to 2.6.16. Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
committed by
Adrian Bunk
parent
725eb3f2eb
commit
809f5560b0
+7
-3
@@ -1243,9 +1243,13 @@ SCTP_STATIC void sctp_close(struct sock *sk, long timeout)
|
||||
sctp_association_free(asoc);
|
||||
|
||||
} else if (sock_flag(sk, SOCK_LINGER) &&
|
||||
!sk->sk_lingertime)
|
||||
sctp_primitive_ABORT(asoc, NULL);
|
||||
else
|
||||
!sk->sk_lingertime) {
|
||||
struct sctp_chunk *chunk;
|
||||
|
||||
chunk = sctp_make_abort_user(asoc, NULL, 0);
|
||||
if (chunk)
|
||||
sctp_primitive_ABORT(asoc, chunk);
|
||||
} else
|
||||
sctp_primitive_SHUTDOWN(asoc, NULL);
|
||||
} else
|
||||
sctp_primitive_SHUTDOWN(asoc, NULL);
|
||||
|
||||
Reference in New Issue
Block a user