Two cleanups. No functional change.

This commit is contained in:
Michael Tuexen 2012-01-15 13:35:55 +00:00
parent 1eb6fc2b27
commit 86eef6072b
2 changed files with 3 additions and 3 deletions

View File

@ -12839,9 +12839,9 @@ sctp_lower_sosend(struct socket *so,
goto out_unlocked; goto out_unlocked;
} }
} }
if ((SCTP_SO_IS_NBIO(so) if (SCTP_SO_IS_NBIO(so)
|| (flags & MSG_NBIO) || (flags & MSG_NBIO)
)) { ) {
non_blocking = 1; non_blocking = 1;
} }
/* would we block? */ /* would we block? */

View File

@ -6373,7 +6373,7 @@ sctp_bindx_delete_address(struct sctp_inpcb *inp,
return; return;
} }
addr_touse = sa; addr_touse = sa;
#if defined(INET6) && !defined(__Userspace__) /* TODO port in6_sin6_2_sin */ #if defined(INET6)
if (sa->sa_family == AF_INET6) { if (sa->sa_family == AF_INET6) {
struct sockaddr_in6 *sin6; struct sockaddr_in6 *sin6;