Index: sys/kern/uipc_mbuf.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_mbuf.c,v
retrieving revision 1.62
diff -u -r1.62 uipc_mbuf.c
--- sys/kern/uipc_mbuf.c	2001/01/16 01:53:13	1.62
+++ sys/kern/uipc_mbuf.c	2001/01/20 20:25:42
@@ -353,9 +353,9 @@
 
 	if (p == NULL) {
 		m_mballoc_wid++;
-		if (msleep(&m_mballoc_wid, &mmbfree.m_mtx, PVM, "mballc",
-		    mbuf_wait) == EWOULDBLOCK)
-			m_mballoc_wid--;
+		msleep(&m_mballoc_wid, &mmbfree.m_mtx, PVM, "mballc",
+		    mbuf_wait);
+		m_mballoc_wid--;
 
 		/*
 		 * Try again (one last time).
@@ -463,9 +463,8 @@
 	caddr_t p = NULL;
 
 	m_clalloc_wid++;
-	if (msleep(&m_clalloc_wid, &mclfree.m_mtx, PVM, "mclalc", mbuf_wait)
-	    == EWOULDBLOCK)
-		m_clalloc_wid--;
+	msleep(&m_clalloc_wid, &mclfree.m_mtx, PVM, "mclalc", mbuf_wait);
+	m_clalloc_wid--;
 
 	/*
 	 * Now that we (think) that we've got something, try again.
Index: sys/sys/mbuf.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/mbuf.h,v
retrieving revision 1.66
diff -u -r1.66 mbuf.h
--- sys/sys/mbuf.h	2000/12/21 21:44:31	1.66
+++ sys/sys/mbuf.h	2001/01/20 20:25:42
@@ -273,10 +273,8 @@
  * Must be called with the appropriate mutex held.
  */
 #define	MBWAKEUP(m_wid) do {						\
-	if ((m_wid)) {							\
-		m_wid--;						\
+	if ((m_wid))							\
 		wakeup_one(&(m_wid)); 					\
-	}								\
 } while (0)
 
 /*