Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 18 Apr 2011 09:10:27 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r220767 - head/sys/netgraph
Message-ID:  <201104180910.p3I9ARJh065050@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ae
Date: Mon Apr 18 09:10:27 2011
New Revision: 220767
URL: http://svn.freebsd.org/changeset/base/220767

Log:
  Use M_WAITOK flag instead M_WAIT for malloc.
  
  Suggested by:	glebius
  MFC after:	1 week

Modified:
  head/sys/netgraph/ng_patch.c

Modified: head/sys/netgraph/ng_patch.c
==============================================================================
--- head/sys/netgraph/ng_patch.c	Mon Apr 18 08:53:22 2011	(r220766)
+++ head/sys/netgraph/ng_patch.c	Mon Apr 18 09:10:27 2011	(r220767)
@@ -165,7 +165,7 @@ ng_patch_constructor(node_p node)
 {
 	priv_p privdata;
 
-	privdata = malloc(sizeof(*privdata), M_NETGRAPH, M_WAIT | M_ZERO);
+	privdata = malloc(sizeof(*privdata), M_NETGRAPH, M_WAITOK | M_ZERO);
 	NG_NODE_SET_PRIVATE(node, privdata);
 	privdata->in = NULL;
 	privdata->out = NULL;
@@ -208,7 +208,8 @@ ng_patch_rcvmsg(node_p node, item_p item
 			if (privp->config == NULL)
 				break;
 			NG_MKRESPONSE(resp, msg,
-			    NG_PATCH_CONF_SIZE(privp->config->count), M_WAIT);
+			    NG_PATCH_CONF_SIZE(privp->config->count),
+			    M_WAITOK);
 			bcopy(privp->config, resp->data,
 			    NG_PATCH_CONF_SIZE(privp->config->count));
 			break;
@@ -248,10 +249,10 @@ ng_patch_rcvmsg(node_p node, item_p item
 			if (error == 0) {
 				newconf = malloc(
 				    NG_PATCH_CONF_SIZE(conf->count),
-				    M_NETGRAPH, M_WAIT);
+				    M_NETGRAPH, M_WAITOK);
 				newval = malloc(conf->count *
 				    sizeof(union patch_val), M_NETGRAPH,
-				    M_WAIT);
+				    M_WAITOK);
 				for(i = 0; i < conf->count; i++) {
 					switch (conf->ops[i].length) {
 					case 1:
@@ -288,7 +289,7 @@ ng_patch_rcvmsg(node_p node, item_p item
 			/* FALLTHROUGH */
 		case NGM_PATCH_GET_STATS:
 			NG_MKRESPONSE(resp, msg, sizeof(struct ng_patch_stats),
-			    M_WAIT);
+			    M_WAITOK);
 			bcopy(&(privp->stats), resp->data,
 			    sizeof(struct ng_patch_stats));
 			if (clear == 0)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104180910.p3I9ARJh065050>