diff options
| author | tuexen <tuexen@FreeBSD.org> | 2012-01-15 13:35:55 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2012-01-15 13:35:55 +0000 |
| commit | a34eb79030aecd17aa9e15ae5ae9eade9e5d1186 (patch) | |
| tree | 1e3016b8de9d055eeb664642609ef80fe41f678f /sys/netinet | |
| parent | a89d0770d671b6d33d526d203dbfb208aeaa149c (diff) | |
| download | FreeBSD-src-a34eb79030aecd17aa9e15ae5ae9eade9e5d1186.zip FreeBSD-src-a34eb79030aecd17aa9e15ae5ae9eade9e5d1186.tar.gz | |
Two cleanups. No functional change.
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/sctp_output.c | 4 | ||||
| -rw-r--r-- | 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 601c4e6..a366036 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 1ff7126da..6f466f1 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; |
