summaryrefslogtreecommitdiffstats
path: root/sys/netgraph/ng_pppoe.c
diff options
context:
space:
mode:
authorarchie <archie@FreeBSD.org>2000-09-21 18:01:23 +0000
committerarchie <archie@FreeBSD.org>2000-09-21 18:01:23 +0000
commit1023c32e1a3679b96f5d97f326b05c06529b214c (patch)
treed5267989f77e49fdb5fc4a6aa641c0b91e4bf969 /sys/netgraph/ng_pppoe.c
parent2ecfa84ffe04f743aceb5489b27662b68b563e18 (diff)
downloadFreeBSD-src-1023c32e1a3679b96f5d97f326b05c06529b214c.zip
FreeBSD-src-1023c32e1a3679b96f5d97f326b05c06529b214c.tar.gz
Allocate all memory (including within node constructors) with M_NOWAIT
instead of M_WAITOK, to allow for maximum flexibility.
Diffstat (limited to 'sys/netgraph/ng_pppoe.c')
-rw-r--r--sys/netgraph/ng_pppoe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c
index a74db26..0d7f2d3 100644
--- a/sys/netgraph/ng_pppoe.c
+++ b/sys/netgraph/ng_pppoe.c
@@ -472,7 +472,7 @@ ng_pppoe_constructor(node_p *nodep)
AAA
/* Initialize private descriptor */
- MALLOC(privdata, priv_p, sizeof(*privdata), M_NETGRAPH, M_WAITOK);
+ MALLOC(privdata, priv_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT);
if (privdata == NULL)
return (ENOMEM);
bzero(privdata, sizeof(*privdata));
@@ -516,7 +516,7 @@ AAA
* The infrastructure has already checked that it's unique,
* so just allocate it and hook it in.
*/
- MALLOC(sp, sessp, sizeof(*sp), M_NETGRAPH, M_WAITOK);
+ MALLOC(sp, sessp, sizeof(*sp), M_NETGRAPH, M_NOWAIT);
if (sp == NULL) {
return (ENOMEM);
}
@@ -591,7 +591,7 @@ AAA
/*
* set up prototype header
*/
- MALLOC(neg, negp, sizeof(*neg), M_NETGRAPH, M_WAITOK);
+ MALLOC(neg, negp, sizeof(*neg), M_NETGRAPH, M_NOWAIT);
if (neg == NULL) {
printf("pppoe: Session out of memory\n");
OpenPOWER on IntegriCloud