---

yaml --- r: 26809 b: refs/heads/master c: b89498a h: refs/heads/master i: 26807: 7a64ea9 v: v3
git-mirror · May 19, 2006 · 1af95e1 · 1af95e1
1 parent 17acdf2
commit 1af95e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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);
 	}