Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev Fix up changes commited in kttcp.c 1.29.
details: https://anonhg.NetBSD.org/src/rev/76695eac6695
branches: trunk
changeset: 772174:76695eac6695
user: jakllsch <jakllsch%NetBSD.org@localhost>
date: Thu Dec 22 02:00:19 2011 +0000
description:
Fix up changes commited in kttcp.c 1.29.
diffstat:
sys/dev/kttcp.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (28 lines):
diff -r 95328b277db2 -r 76695eac6695 sys/dev/kttcp.c
--- a/sys/dev/kttcp.c Wed Dec 21 22:18:43 2011 +0000
+++ b/sys/dev/kttcp.c Thu Dec 22 02:00:19 2011 +0000
@@ -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 @@
}
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;
}
Home |
Main Index |
Thread Index |
Old Index