check for M_DONTWAIT in NG_MKMESSAGE

Gleb Smirnoff glebius at cell.sick.ru
Mon Jun 7 21:47:02 GMT 2004


On Mon, Jun 07, 2004 at 04:58:27PM -0400, Brian Feldman wrote:
B> > Seems like you problem is caused (indirectly) by mbuma import. See
B> > 
B> > http://lists.freebsd.org/pipermail/freebsd-current/2004-June/028153.html
B> > 
B> > Perhaps Bosko has more comments.
B> 
B> Please try removing both KASSERT() calls from NG_MKMESSAGE() in
B> src/sys/sys/ng_message.h, and then rebuild (and unload and reload)
B> all netgraph modules.  The KASSERT() lines appear to be entirely
B> bogus now.

Agreed. After mbuma import the first KASSERT() definitely must be removed.
Julian, take a look at this. It must be fixed ASAP.

-- 
Totus tuus, Glebius.
GLEBIUS-RIPN GLEB-RIPE
-------------- next part --------------
Index: ng_message.h
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_message.h,v
retrieving revision 1.22
diff -u -r1.22 ng_message.h
--- ng_message.h	26 Jan 2004 14:05:31 -0000	1.22
+++ ng_message.h	7 Jun 2004 21:45:06 -0000
@@ -371,8 +371,6 @@
  */
 #define NG_MKMESSAGE(msg, cookie, cmdid, len, how)			\
 	do {								\
-	  KASSERT(!(how & M_DONTWAIT),					\
-	      ("NG_MKMESSAGE() with how=M_DONTWAIT (%d)\n", how));	\
 	  KASSERT(!(how & M_TRYWAIT),					\
 	      ("NG_MKMESSAGE() with how=M_TRYWAIT (%d)\n", how));	\
 	  MALLOC((msg), struct ng_mesg *, sizeof(struct ng_mesg)	\


More information about the freebsd-net mailing list