Author: tuexen
Date: Sat Feb 11 01:09:46 2012
New Revision: 231498
URL: http://svn.freebsd.org/changeset/base/231498
Log:
MFC r230136:
Two cleanups. No functional change.
Modified:
stable/8/sys/netinet/sctp_output.c
stable/8/sys/netinet/sctputil.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/boot/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/e1000/ (props changed)
Modified: stable/8/sys/netinet/sctp_output.c
==============================================================================
--- stable/8/sys/netinet/sctp_output.c Sat Feb 11 01:07:51 2012
(r231497)
+++ stable/8/sys/netinet/sctp_output.c Sat Feb 11 01:09:46 2012
(r231498)
@@ -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: stable/8/sys/netinet/sctputil.c
==============================================================================
--- stable/8/sys/netinet/sctputil.c Sat Feb 11 01:07:51 2012
(r231497)
+++ stable/8/sys/netinet/sctputil.c Sat Feb 11 01:09:46 2012
(r231498)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
