From owner-svn-src-all@FreeBSD.ORG  Thu Mar  7 23:37:54 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 6C2FF1A7;
 Thu,  7 Mar 2013 23:37:54 +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 463E0AC5;
 Thu,  7 Mar 2013 23:37:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r27NbsW1055641;
 Thu, 7 Mar 2013 23:37:54 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r27NbsrU055640;
 Thu, 7 Mar 2013 23:37:54 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201303072337.r27NbsrU055640@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Thu, 7 Mar 2013 23:37:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r247970 - stable/8/sys/netinet
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Mar 2013 23:37:54 -0000

Author: tuexen
Date: Thu Mar  7 23:37:53 2013
New Revision: 247970
URL: http://svnweb.freebsd.org/changeset/base/247970

Log:
  MFC r238454:
  Bugfix: Send up a COMM UP notification for active 1-to-1 style sockets
          also in the case where the assoc comes up due to a remotely
          started handshake (collision case).

Modified:
  stable/8/sys/netinet/sctp_input.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/netinet/sctp_input.c
==============================================================================
--- stable/8/sys/netinet/sctp_input.c	Thu Mar  7 23:37:10 2013	(r247969)
+++ stable/8/sys/netinet/sctp_input.c	Thu Mar  7 23:37:53 2013	(r247970)
@@ -2874,14 +2874,12 @@ sctp_handle_cookie_echo(struct mbuf *m, 
 			return (m);
 		}
 	}
-	if ((*inp_p)->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) {
-		if (notification) {
-			sctp_ulp_notify(notification, *stcb, 0, NULL, SCTP_SO_NOT_LOCKED);
-		}
-		if (send_int_conf) {
-			sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_CONFIRMED,
-			    (*stcb), 0, (void *)netl, SCTP_SO_NOT_LOCKED);
-		}
+	if (notification) {
+		sctp_ulp_notify(notification, *stcb, 0, NULL, SCTP_SO_NOT_LOCKED);
+	}
+	if (send_int_conf) {
+		sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_CONFIRMED,
+		    (*stcb), 0, (void *)netl, SCTP_SO_NOT_LOCKED);
 	}
 	return (m);
 }