svn commit: r231050 - stable/9/sys/netinet

[Michael Tuexen]

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;