svn commit: r230136 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sun Jan 15 13:35:55 2012
New Revision: 230136
URL: http://svn.freebsd.org/changeset/base/230136

Log:
  Two cleanups. No functional change.

Modified:
  head/sys/netinet/sctp_output.c
  head/sys/netinet/sctputil.c

Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c	Sun Jan 15 13:23:54 2012	(r230135)
+++ head/sys/netinet/sctp_output.c	Sun Jan 15 13:35:55 2012	(r230136)
@@ -12839,9 +12839,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: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c	Sun Jan 15 13:23:54 2012	(r230135)
+++ head/sys/netinet/sctputil.c	Sun Jan 15 13:35:55 2012	(r230136)
@@ -6373,7 +6373,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;