From 918549eb3151450239d659ae968cb9e68b863bfc Mon Sep 17 00:00:00 2001 From: dwmalone Date: Sat, 18 Nov 2000 15:17:43 +0000 Subject: Add the use of M_ZERO to netgraph. Submitted by: josh@zipperup.org Submitted by: Robert Drehmel Submitted by: archie Approved by: archie --- sys/netgraph/ng_pppoe.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'sys/netgraph/ng_pppoe.c') diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c index 331572f..193c99a 100644 --- a/sys/netgraph/ng_pppoe.c +++ b/sys/netgraph/ng_pppoe.c @@ -537,10 +537,10 @@ ng_pppoe_constructor(node_p *nodep) AAA /* Initialize private descriptor */ - MALLOC(privdata, priv_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT); + MALLOC(privdata, priv_p, sizeof(*privdata), M_NETGRAPH, + M_NOWAIT | M_ZERO); if (privdata == NULL) return (ENOMEM); - bzero(privdata, sizeof(*privdata)); /* Call the 'generic' (ie, superclass) node constructor */ if ((error = ng_make_node_common(&typestruct, nodep))) { @@ -581,11 +581,10 @@ 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_NOWAIT); + MALLOC(sp, sessp, sizeof(*sp), M_NETGRAPH, M_NOWAIT | M_ZERO); if (sp == NULL) { return (ENOMEM); } - bzero(sp, sizeof(*sp)); hook->private = sp; sp->hook = hook; @@ -662,13 +661,13 @@ AAA /* * set up prototype header */ - MALLOC(neg, negp, sizeof(*neg), M_NETGRAPH, M_NOWAIT); + MALLOC(neg, negp, sizeof(*neg), M_NETGRAPH, + M_NOWAIT | M_ZERO); if (neg == NULL) { printf("pppoe: Session out of memory\n"); LEAVE(ENOMEM); } - bzero(neg, sizeof(*neg)); MGETHDR(neg->m, M_DONTWAIT, MT_DATA); if(neg->m == NULL) { printf("pppoe: Session out of mbufs\n"); -- cgit v1.1