Module Name: src
Committed By: christos
Date: Wed Dec 21 15:26:57 UTC 2011
Modified Files:
src/sys/kern: uipc_syscalls.c
Log Message:
simplify expression
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/kern/uipc_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.149 src/sys/kern/uipc_syscalls.c:1.150
--- src/sys/kern/uipc_syscalls.c:1.149 Tue Dec 20 18:56:28 2011
+++ src/sys/kern/uipc_syscalls.c Wed Dec 21 10:26:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.149 2011/12/20 23:56:28 christos Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.150 2011/12/21 15:26:57 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.149 2011/12/20 23:56:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.150 2011/12/21 15:26:57 christos Exp $");
#include "opt_pipe.h"
@@ -367,7 +367,8 @@ do_sys_connect(struct lwp *l, int fd, st
error = soconnect(so, nam, l);
if (error)
goto bad;
- if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING) != 0) {
+ if ((so->so_state & (SS_NBIO|SS_ISCONNECTING)) ==
+ (SS_NBIO|SS_ISCONNECTING)) {
error = EINPROGRESS;
goto out;
}
