[src/netbsd-3-0]: src/sys/sys Pull up following revision(s) (requested by chr...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/67cb8e339080
branches:  netbsd-3-0
changeset: 579437:67cb8e339080
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Aug 26 19:51:46 2007 +0000

description:
Pull up following revision(s) (requested by christos in ticket #1808):
        sys/sys/socketvar.h: revision 1.97
>From FreeBSD:
  Fix a bug in sblock() that has existed since revision 1.1 from BSD:
  correctly return an error if M_NOWAIT is passed to sblock() and the
  operation might block.  This remarkably subtle macro bug appears to
  be responsible for quite a few undiagnosed socket buffer corruption
  and mbuf-related kernel panics.

diffstat:

 sys/sys/socketvar.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r c37452683977 -r 67cb8e339080 sys/sys/socketvar.h
--- a/sys/sys/socketvar.h       Tue Aug 14 10:35:38 2007 +0000
+++ b/sys/sys/socketvar.h       Sun Aug 26 19:51:46 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: socketvar.h,v 1.80 2004/09/03 18:14:09 darrenr Exp $   */
+/*     $NetBSD: socketvar.h,v 1.80.12.1 2007/08/26 19:51:46 bouyer Exp $       */
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -226,7 +226,7 @@
 #define        sblock(sb, wf)                                                  \
        ((sb)->sb_flags & SB_LOCK ?                                     \
            (((wf) == M_WAITOK) ? sb_lock(sb) : EWOULDBLOCK) :          \
-           ((sb)->sb_flags |= SB_LOCK), 0)
+           ((sb)->sb_flags |= SB_LOCK, 0))
 
 /* release lock on sockbuf sb */
 #define        sbunlock(sb)                                                    \