From owner-svn-src-stable-9@FreeBSD.ORG  Sun Jul  7 13:20:36 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 45FF941D;
 Sun,  7 Jul 2013 13:20:36 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 38D2C15CA;
 Sun,  7 Jul 2013 13:20:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r67DKapb097887;
 Sun, 7 Jul 2013 13:20:36 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r67DKac5097886;
 Sun, 7 Jul 2013 13:20:36 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201307071320.r67DKac5097886@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Sun, 7 Jul 2013 13:20:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252950 - stable/9/sys/netinet
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Jul 2013 13:20:36 -0000

Author: tuexen
Date: Sun Jul  7 13:20:35 2013
New Revision: 252950
URL: http://svnweb.freebsd.org/changeset/base/252950

Log:
  MFC r243565:
  Add support for sctp_peeloff() also in the front states of the
  association.

Modified:
  stable/9/sys/netinet/sctp_peeloff.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/sctp_peeloff.c
==============================================================================
--- stable/9/sys/netinet/sctp_peeloff.c	Sun Jul  7 13:18:19 2013	(r252949)
+++ stable/9/sys/netinet/sctp_peeloff.c	Sun Jul  7 13:20:35 2013	(r252950)
@@ -74,9 +74,7 @@ sctp_can_peel_off(struct socket *head, s
 	}
 	state = SCTP_GET_STATE((&stcb->asoc));
 	if ((state == SCTP_STATE_EMPTY) ||
-	    (state == SCTP_STATE_INUSE) ||
-	    (state == SCTP_STATE_COOKIE_WAIT) ||
-	    (state == SCTP_STATE_COOKIE_ECHOED)) {
+	    (state == SCTP_STATE_INUSE)) {
 		SCTP_TCB_UNLOCK(stcb);
 		SCTP_LTRACE_ERR_RET(inp, stcb, NULL, SCTP_FROM_SCTP_PEELOFF, ENOTCONN);
 		return (ENOTCONN);
@@ -105,9 +103,7 @@ sctp_do_peeloff(struct socket *head, str
 	}
 	state = SCTP_GET_STATE((&stcb->asoc));
 	if ((state == SCTP_STATE_EMPTY) ||
-	    (state == SCTP_STATE_INUSE) ||
-	    (state == SCTP_STATE_COOKIE_WAIT) ||
-	    (state == SCTP_STATE_COOKIE_ECHOED)) {
+	    (state == SCTP_STATE_INUSE)) {
 		SCTP_TCB_UNLOCK(stcb);
 		SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PEELOFF, ENOTCONN);
 		return (ENOTCONN);