Node constructor methods are supposed to be called in syscall

context always. Convert nodes to consistently use M_WAITOK flag
for memory allocation.

Reviewed by:	julian

4 files changed, 4 insertions, 9 deletions

diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c
index 7030369..92e162c 100644
--- a/sys/netgraph/atm/ccatm/ng_ccatm.c
+++ b/sys/netgraph/atm/ccatm/ng_ccatm.c
@@ -348,9 +348,7 @@ ng_ccatm_constructor(node_p node)
 {
 	struct ccnode *priv;
 
-	priv = malloc(sizeof(*priv), M_NG_CCATM, M_NOWAIT | M_ZERO);
-	if (priv == NULL)
-		return (ENOMEM);
+	priv = malloc(sizeof(*priv), M_NG_CCATM, M_WAITOK | M_ZERO);
 
 	priv->node = node;
 	priv->data = cc_create(&cc_funcs);
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c
index 47413b5..cca8198 100644
--- a/sys/netgraph/atm/sscfu/ng_sscfu.c
+++ b/sys/netgraph/atm/sscfu/ng_sscfu.c
@@ -538,8 +538,7 @@ ng_sscfu_constructor(node_p node)
 {
 	struct priv *priv;
 
-	if ((priv = malloc(sizeof(*priv), M_NG_SSCFU, M_NOWAIT|M_ZERO)) == NULL)
-		return (ENOMEM);
+	priv = malloc(sizeof(*priv), M_NG_SSCFU, M_WAITOK | M_ZERO);
 
 	if ((priv->sscf = sscfu_create(node, &sscfu_funcs)) == NULL) {
 		free(priv, M_NG_SSCFU);
diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c
index cf52cc9..729c818 100644
--- a/sys/netgraph/atm/sscop/ng_sscop.c
+++ b/sys/netgraph/atm/sscop/ng_sscop.c
@@ -246,8 +246,7 @@ ng_sscop_constructor(node_p node)
 {
 	struct priv *p;
 
-	if ((p = malloc(sizeof(*p), M_NG_SSCOP, M_NOWAIT | M_ZERO)) == NULL)
-		return (ENOMEM);
+	p = malloc(sizeof(*p), M_NG_SSCOP, M_WAITOK | M_ZERO);
 
 	if ((p->sscop = sscop_create(node, &sscop_funcs)) == NULL) {
 		free(p, M_NG_SSCOP);
diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c
index 5b2a7ff..2fc9599 100644
--- a/sys/netgraph/atm/uni/ng_uni.c
+++ b/sys/netgraph/atm/uni/ng_uni.c
@@ -223,8 +223,7 @@ ng_uni_constructor(node_p node)
 {
 	struct priv *priv;
 
-	if ((priv = malloc(sizeof(*priv), M_NG_UNI, M_NOWAIT | M_ZERO)) == NULL)
-		return (ENOMEM);
+	priv = malloc(sizeof(*priv), M_NG_UNI, M_WAITOK | M_ZERO);
 
 	if ((priv->uni = uni_create(node, &uni_funcs)) == NULL) {
 		free(priv, M_NG_UNI);