From owner-svn-src-stable@FreeBSD.ORG Sun Feb 5 20:47:27 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id A0B1D1065674;
Sun, 5 Feb 2012 20:47:27 +0000 (UTC)
(envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 8AFF38FC12;
Sun, 5 Feb 2012 20:47:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q15KlR6e000847;
Sun, 5 Feb 2012 20:47:27 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q15KlRI9000844;
Sun, 5 Feb 2012 20:47:27 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201202052047.q15KlRI9000844@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Sun, 5 Feb 2012 20:47:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r231050 - stable/9/sys/netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Feb 2012 20:47:27 -0000
Author: tuexen
Date: Sun Feb 5 20:47:26 2012
New Revision: 231050
URL: http://svn.freebsd.org/changeset/base/231050
Log:
MFC r230136:
Two cleanups. No functional change.
Modified:
stable/9/sys/netinet/sctp_output.c
stable/9/sys/netinet/sctputil.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctp_output.c
==============================================================================
--- stable/9/sys/netinet/sctp_output.c Sun Feb 5 20:45:32 2012 (r231049)
+++ stable/9/sys/netinet/sctp_output.c Sun Feb 5 20:47:26 2012 (r231050)
@@ -12815,9 +12815,9 @@ sctp_lower_sosend(struct socket *so,
goto out_unlocked;
}
}
- if ((SCTP_SO_IS_NBIO(so)
+ if (SCTP_SO_IS_NBIO(so)
|| (flags & MSG_NBIO)
- )) {
+ ) {
non_blocking = 1;
}
/* would we block? */
Modified: stable/9/sys/netinet/sctputil.c
==============================================================================
--- stable/9/sys/netinet/sctputil.c Sun Feb 5 20:45:32 2012 (r231049)
+++ stable/9/sys/netinet/sctputil.c Sun Feb 5 20:47:26 2012 (r231050)
@@ -6372,7 +6372,7 @@ sctp_bindx_delete_address(struct sctp_in
return;
}
addr_touse = sa;
-#if defined(INET6) && !defined(__Userspace__) /* TODO port in6_sin6_2_sin */
+#if defined(INET6)
if (sa->sa_family == AF_INET6) {
struct sockaddr_in6 *sin6;