Module Name: src
Committed By: jakllsch
Date: Thu Dec 22 02:00:19 UTC 2011
Modified Files:
src/sys/dev: kttcp.c
Log Message:
Fix up changes commited in kttcp.c 1.29.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/kttcp.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/dev/kttcp.c
diff -u src/sys/dev/kttcp.c:1.29 src/sys/dev/kttcp.c:1.30
--- src/sys/dev/kttcp.c:1.29 Tue Dec 20 23:56:28 2011
+++ src/sys/dev/kttcp.c Thu Dec 22 02:00:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kttcp.c,v 1.29 2011/12/20 23:56:28 christos Exp $ */
+/* $NetBSD: kttcp.c,v 1.30 2011/12/22 02:00:19 jakllsch Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.29 2011/12/20 23:56:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.30 2011/12/22 02:00:19 jakllsch Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -427,7 +427,8 @@ kttcp_soreceive(struct socket *so, unsig
}
if (resid == 0)
goto release;
- if ((so->so_so_state & SS_NBIO) || (flags & MSG_DONTWAIT|MSG_NBIO)) {
+ if ((so->so_state & SS_NBIO) ||
+ (flags & (MSG_DONTWAIT|MSG_NBIO))) {
error = EWOULDBLOCK;
goto release;
}
