From a34eb79030aecd17aa9e15ae5ae9eade9e5d1186 Mon Sep 17 00:00:00 2001
From: tuexen <tuexen@FreeBSD.org>
Date: Sun, 15 Jan 2012 13:35:55 +0000
Subject: [PATCH] Two cleanups. No functional change.

---
 sys/netinet/sctp_output.c | 4 ++--
 sys/netinet/sctputil.c    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 601c4e638fd4..a36603678646 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -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? */
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 1ff7126da0d1..6f466f191fa1 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -6373,7 +6373,7 @@ sctp_bindx_delete_address(struct sctp_inpcb *inp,
 		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;