From 1af95e10f0897feec2b70fff2e285ffa44648425 Mon Sep 17 00:00:00 2001 From: Vladislav Yasevich Date: Fri, 19 May 2006 14:32:06 -0700 Subject: [PATCH] --- yaml --- r: 26809 b: refs/heads/master c: b89498a1c2941c00889dd025f52dcb653a5083bc h: refs/heads/master i: 26807: 7a64ea94d844d60028cac6cdc0c3cc5c8c1dbe56 v: v3 --- [refs] | 2 +- trunk/net/sctp/socket.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fe6f9e9a30c6..0e6e3ce029a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a601266e4f3c479790f373c2e3122a766d123652 +refs/heads/master: b89498a1c2941c00889dd025f52dcb653a5083bc diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index b1a17758003a..174d4d35e951 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -1242,13 +1242,13 @@ SCTP_STATIC void sctp_close(struct sock *sk, long timeout) if (sctp_state(asoc, CLOSED)) { sctp_unhash_established(asoc); sctp_association_free(asoc); + continue; + } + } - } else if (sock_flag(sk, SOCK_LINGER) && - !sk->sk_lingertime) - sctp_primitive_ABORT(asoc, NULL); - else - sctp_primitive_SHUTDOWN(asoc, NULL); - } else + if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime) + sctp_primitive_ABORT(asoc, NULL); + else sctp_primitive_SHUTDOWN(asoc, NULL); }