From owner-svn-src-all@FreeBSD.ORG Mon Apr 18 09:12:28 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B80C8106564A; Mon, 18 Apr 2011 09:12:28 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A452B8FC0C; Mon, 18 Apr 2011 09:12:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3I9CSwS065181; Mon, 18 Apr 2011 09:12:28 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3I9CSqE065139; Mon, 18 Apr 2011 09:12:28 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201104180912.p3I9CSqE065139@svn.freebsd.org> From: Gleb Smirnoff Date: Mon, 18 Apr 2011 09:12:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220768 - in head/sys/netgraph: . atm/ccatm atm/sscfu atm/sscop atm/uni bluetooth/hci bluetooth/l2cap netflow X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2011 09:12:28 -0000 Author: glebius Date: Mon Apr 18 09:12:27 2011 New Revision: 220768 URL: http://svn.freebsd.org/changeset/base/220768 Log: 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 Modified: head/sys/netgraph/atm/ccatm/ng_ccatm.c head/sys/netgraph/atm/sscfu/ng_sscfu.c head/sys/netgraph/atm/sscop/ng_sscop.c head/sys/netgraph/atm/uni/ng_uni.c head/sys/netgraph/bluetooth/hci/ng_hci_main.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c head/sys/netgraph/netflow/ng_netflow.c head/sys/netgraph/ng_UI.c head/sys/netgraph/ng_async.c head/sys/netgraph/ng_atmllc.c head/sys/netgraph/ng_bridge.c head/sys/netgraph/ng_car.c head/sys/netgraph/ng_cisco.c head/sys/netgraph/ng_device.c head/sys/netgraph/ng_eiface.c head/sys/netgraph/ng_etf.c head/sys/netgraph/ng_fec.c head/sys/netgraph/ng_frame_relay.c head/sys/netgraph/ng_gif_demux.c head/sys/netgraph/ng_hub.c head/sys/netgraph/ng_iface.c head/sys/netgraph/ng_ksocket.c head/sys/netgraph/ng_l2tp.c head/sys/netgraph/ng_lmi.c head/sys/netgraph/ng_mppc.c head/sys/netgraph/ng_nat.c head/sys/netgraph/ng_one2many.c head/sys/netgraph/ng_pipe.c head/sys/netgraph/ng_ppp.c head/sys/netgraph/ng_pppoe.c head/sys/netgraph/ng_pptpgre.c head/sys/netgraph/ng_rfc1490.c head/sys/netgraph/ng_sample.c head/sys/netgraph/ng_source.c head/sys/netgraph/ng_split.c head/sys/netgraph/ng_sppp.c head/sys/netgraph/ng_tee.c head/sys/netgraph/ng_tty.c head/sys/netgraph/ng_vjc.c head/sys/netgraph/ng_vlan.c Modified: head/sys/netgraph/atm/ccatm/ng_ccatm.c ============================================================================== --- head/sys/netgraph/atm/ccatm/ng_ccatm.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/atm/ccatm/ng_ccatm.c Mon Apr 18 09:12:27 2011 (r220768) @@ -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); Modified: head/sys/netgraph/atm/sscfu/ng_sscfu.c ============================================================================== --- head/sys/netgraph/atm/sscfu/ng_sscfu.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/atm/sscfu/ng_sscfu.c Mon Apr 18 09:12:27 2011 (r220768) @@ -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); Modified: head/sys/netgraph/atm/sscop/ng_sscop.c ============================================================================== --- head/sys/netgraph/atm/sscop/ng_sscop.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/atm/sscop/ng_sscop.c Mon Apr 18 09:12:27 2011 (r220768) @@ -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); Modified: head/sys/netgraph/atm/uni/ng_uni.c ============================================================================== --- head/sys/netgraph/atm/uni/ng_uni.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/atm/uni/ng_uni.c Mon Apr 18 09:12:27 2011 (r220768) @@ -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); Modified: head/sys/netgraph/bluetooth/hci/ng_hci_main.c ============================================================================== --- head/sys/netgraph/bluetooth/hci/ng_hci_main.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/bluetooth/hci/ng_hci_main.c Mon Apr 18 09:12:27 2011 (r220768) @@ -109,10 +109,7 @@ ng_hci_constructor(node_p node) { ng_hci_unit_p unit = NULL; - unit = malloc(sizeof(*unit), M_NETGRAPH_HCI, - M_NOWAIT | M_ZERO); - if (unit == NULL) - return (ENOMEM); + unit = malloc(sizeof(*unit), M_NETGRAPH_HCI, M_WAITOK | M_ZERO); unit->node = node; unit->debug = NG_HCI_WARN_LEVEL; Modified: head/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c ============================================================================== --- head/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c Mon Apr 18 09:12:27 2011 (r220768) @@ -113,10 +113,7 @@ ng_l2cap_constructor(node_p node) ng_l2cap_p l2cap = NULL; /* Create new L2CAP node */ - l2cap = malloc(sizeof(*l2cap), - M_NETGRAPH_L2CAP, M_NOWAIT|M_ZERO); - if (l2cap == NULL) - return (ENOMEM); + l2cap = malloc(sizeof(*l2cap), M_NETGRAPH_L2CAP, M_WAITOK | M_ZERO); l2cap->node = node; l2cap->debug = NG_L2CAP_WARN_LEVEL; Modified: head/sys/netgraph/netflow/ng_netflow.c ============================================================================== --- head/sys/netgraph/netflow/ng_netflow.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/netflow/ng_netflow.c Mon Apr 18 09:12:27 2011 (r220768) @@ -223,10 +223,7 @@ ng_netflow_constructor(node_p node) int error = 0, i; /* Initialize private data */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT); - if (priv == NULL) - return (ENOMEM); - bzero(priv, sizeof(*priv)); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); /* Make node and its data point at each other */ NG_NODE_SET_PRIVATE(node, priv); Modified: head/sys/netgraph/ng_UI.c ============================================================================== --- head/sys/netgraph/ng_UI.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_UI.c Mon Apr 18 09:12:27 2011 (r220768) @@ -103,10 +103,7 @@ ng_UI_constructor(node_p node) priv_p priv; /* Allocate private structure */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (priv == NULL) { - return (ENOMEM); - } + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); return (0); } Modified: head/sys/netgraph/ng_async.c ============================================================================== --- head/sys/netgraph/ng_async.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_async.c Mon Apr 18 09:12:27 2011 (r220768) @@ -183,25 +183,15 @@ nga_constructor(node_p node) { sc_p sc; - sc = malloc(sizeof(*sc), M_NETGRAPH_ASYNC, M_NOWAIT | M_ZERO); - if (sc == NULL) - return (ENOMEM); + sc = malloc(sizeof(*sc), M_NETGRAPH_ASYNC, M_WAITOK | M_ZERO); sc->amode = MODE_HUNT; sc->cfg.accm = ~0; sc->cfg.amru = NG_ASYNC_DEFAULT_MRU; sc->cfg.smru = NG_ASYNC_DEFAULT_MRU; sc->abuf = malloc(ASYNC_BUF_SIZE(sc->cfg.smru), - M_NETGRAPH_ASYNC, M_NOWAIT); - if (sc->abuf == NULL) - goto fail; + M_NETGRAPH_ASYNC, M_WAITOK); sc->sbuf = malloc(SYNC_BUF_SIZE(sc->cfg.amru), - M_NETGRAPH_ASYNC, M_NOWAIT); - if (sc->sbuf == NULL) { - free(sc->abuf, M_NETGRAPH_ASYNC); -fail: - free(sc, M_NETGRAPH_ASYNC); - return (ENOMEM); - } + M_NETGRAPH_ASYNC, M_WAITOK); NG_NODE_SET_PRIVATE(node, sc); sc->node = node; return (0); Modified: head/sys/netgraph/ng_atmllc.c ============================================================================== --- head/sys/netgraph/ng_atmllc.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_atmllc.c Mon Apr 18 09:12:27 2011 (r220768) @@ -80,12 +80,7 @@ ng_atmllc_constructor(node_p node) { struct ng_atmllc_priv *priv; - priv = malloc(sizeof(*priv), M_NETGRAPH, - M_NOWAIT | M_ZERO); - if (priv == NULL) { - return (ENOMEM); - } - + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); return (0); Modified: head/sys/netgraph/ng_bridge.c ============================================================================== --- head/sys/netgraph/ng_bridge.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_bridge.c Mon Apr 18 09:12:27 2011 (r220768) @@ -309,18 +309,12 @@ ng_bridge_constructor(node_p node) priv_p priv; /* Allocate and initialize private info */ - priv = malloc(sizeof(*priv), M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH_BRIDGE, M_WAITOK | M_ZERO); ng_callout_init(&priv->timer); /* Allocate and initialize hash table, etc. */ priv->tab = malloc(MIN_BUCKETS * sizeof(*priv->tab), - M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO); - if (priv->tab == NULL) { - free(priv, M_NETGRAPH_BRIDGE); - return (ENOMEM); - } + M_NETGRAPH_BRIDGE, M_WAITOK | M_ZERO); priv->numBuckets = MIN_BUCKETS; priv->hashMask = MIN_BUCKETS - 1; priv->conf.debugLevel = 1; Modified: head/sys/netgraph/ng_car.c ============================================================================== --- head/sys/netgraph/ng_car.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_car.c Mon Apr 18 09:12:27 2011 (r220768) @@ -186,9 +186,7 @@ ng_car_constructor(node_p node) priv_p priv; /* Initialize private descriptor. */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); priv->node = node; Modified: head/sys/netgraph/ng_cisco.c ============================================================================== --- head/sys/netgraph/ng_cisco.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_cisco.c Mon Apr 18 09:12:27 2011 (r220768) @@ -193,9 +193,7 @@ cisco_constructor(node_p node) { sc_p sc; - sc = malloc(sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (sc == NULL) - return (ENOMEM); + sc = malloc(sizeof(*sc), M_NETGRAPH, M_WAITOK | M_ZERO); ng_callout_init(&sc->handle); NG_NODE_SET_PRIVATE(node, sc); Modified: head/sys/netgraph/ng_device.c ============================================================================== --- head/sys/netgraph/ng_device.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_device.c Mon Apr 18 09:12:27 2011 (r220768) @@ -163,9 +163,7 @@ ng_device_constructor(node_p node) DBG; - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); /* Allocate unit number */ priv->unit = alloc_unr(ngd_unit); Modified: head/sys/netgraph/ng_eiface.c ============================================================================== --- head/sys/netgraph/ng_eiface.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_eiface.c Mon Apr 18 09:12:27 2011 (r220768) @@ -343,9 +343,7 @@ ng_eiface_constructor(node_p node) u_char eaddr[6] = {0,0,0,0,0,0}; /* Allocate node and interface private structures */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); ifp = priv->ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { Modified: head/sys/netgraph/ng_etf.c ============================================================================== --- head/sys/netgraph/ng_etf.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_etf.c Mon Apr 18 09:12:27 2011 (r220768) @@ -180,10 +180,7 @@ ng_etf_constructor(node_p node) int i; /* Initialize private descriptor */ - privdata = malloc(sizeof(*privdata), M_NETGRAPH_ETF, - M_NOWAIT | M_ZERO); - if (privdata == NULL) - return (ENOMEM); + privdata = malloc(sizeof(*privdata), M_NETGRAPH_ETF, M_WAITOK | M_ZERO); for (i = 0; i < HASHSIZE; i++) { LIST_INIT((privdata->hashtable + i)); } Modified: head/sys/netgraph/ng_fec.c ============================================================================== --- head/sys/netgraph/ng_fec.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_fec.c Mon Apr 18 09:12:27 2011 (r220768) @@ -1197,9 +1197,7 @@ ng_fec_constructor(node_p node) int error = 0; /* Allocate node and interface private structures */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); ifp = priv->ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { Modified: head/sys/netgraph/ng_frame_relay.c ============================================================================== --- head/sys/netgraph/ng_frame_relay.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_frame_relay.c Mon Apr 18 09:12:27 2011 (r220768) @@ -212,9 +212,7 @@ ngfrm_constructor(node_p node) { sc_p sc; - sc = malloc(sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (!sc) - return (ENOMEM); + sc = malloc(sizeof(*sc), M_NETGRAPH, M_WAITOK | M_ZERO); sc->addrlen = 2; /* default */ /* Link the node and our private info */ Modified: head/sys/netgraph/ng_gif_demux.c ============================================================================== --- head/sys/netgraph/ng_gif_demux.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_gif_demux.c Mon Apr 18 09:12:27 2011 (r220768) @@ -233,10 +233,7 @@ ng_gif_demux_constructor(node_p node) priv_p priv; /* Allocate and initialize private info */ - priv = malloc(sizeof(*priv), M_NETGRAPH_GIF_DEMUX, - M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH_GIF_DEMUX, M_WAITOK | M_ZERO); priv->node = node; NG_NODE_SET_PRIVATE(node, priv); Modified: head/sys/netgraph/ng_hub.c ============================================================================== --- head/sys/netgraph/ng_hub.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_hub.c Mon Apr 18 09:12:27 2011 (r220768) @@ -86,9 +86,7 @@ ng_hub_constructor(node_p node) priv_p priv; /* Allocate and initialize private info */ - priv = malloc(sizeof(*priv), M_NETGRAPH_HUB, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH_HUB, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); return (0); Modified: head/sys/netgraph/ng_iface.c ============================================================================== --- head/sys/netgraph/ng_iface.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_iface.c Mon Apr 18 09:12:27 2011 (r220768) @@ -531,9 +531,7 @@ ng_iface_constructor(node_p node) priv_p priv; /* Allocate node and interface private structures */ - priv = malloc(sizeof(*priv), M_NETGRAPH_IFACE, M_NOWAIT|M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH_IFACE, M_WAITOK | M_ZERO); ifp = if_alloc(IFT_PROPVIRTUAL); if (ifp == NULL) { free(priv, M_NETGRAPH_IFACE); Modified: head/sys/netgraph/ng_ksocket.c ============================================================================== --- head/sys/netgraph/ng_ksocket.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_ksocket.c Mon Apr 18 09:12:27 2011 (r220768) @@ -523,10 +523,7 @@ ng_ksocket_constructor(node_p node) priv_p priv; /* Allocate private structure */ - priv = malloc(sizeof(*priv), - M_NETGRAPH_KSOCKET, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH_KSOCKET, M_WAITOK | M_ZERO); LIST_INIT(&priv->embryos); /* cross link them */ Modified: head/sys/netgraph/ng_l2tp.c ============================================================================== --- head/sys/netgraph/ng_l2tp.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_l2tp.c Mon Apr 18 09:12:27 2011 (r220768) @@ -361,9 +361,7 @@ ng_l2tp_constructor(node_p node) int i; /* Allocate private structure */ - priv = malloc(sizeof(*priv), M_NETGRAPH_L2TP, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH_L2TP, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); priv->node = node; Modified: head/sys/netgraph/ng_lmi.c ============================================================================== --- head/sys/netgraph/ng_lmi.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_lmi.c Mon Apr 18 09:12:27 2011 (r220768) @@ -185,9 +185,7 @@ nglmi_constructor(node_p node) { sc_p sc; - sc = malloc(sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (sc == NULL) - return (ENOMEM); + sc = malloc(sizeof(*sc), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, sc); sc->node = node; Modified: head/sys/netgraph/ng_mppc.c ============================================================================== --- head/sys/netgraph/ng_mppc.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_mppc.c Mon Apr 18 09:12:27 2011 (r220768) @@ -201,9 +201,7 @@ ng_mppc_constructor(node_p node) priv_p priv; /* Allocate private structure */ - priv = malloc(sizeof(*priv), M_NETGRAPH_MPPC, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH_MPPC, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); Modified: head/sys/netgraph/ng_nat.c ============================================================================== --- head/sys/netgraph/ng_nat.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_nat.c Mon Apr 18 09:12:27 2011 (r220768) @@ -272,10 +272,7 @@ ng_nat_constructor(node_p node) priv_p priv; /* Initialize private descriptor. */ - priv = malloc(sizeof(*priv), M_NETGRAPH, - M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); /* Init aliasing engine. */ priv->lib = LibAliasInit(NULL); Modified: head/sys/netgraph/ng_one2many.c ============================================================================== --- head/sys/netgraph/ng_one2many.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_one2many.c Mon Apr 18 09:12:27 2011 (r220768) @@ -187,9 +187,7 @@ ng_one2many_constructor(node_p node) priv_p priv; /* Allocate and initialize private info */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); priv->conf.xmitAlg = NG_ONE2MANY_XMIT_ROUNDROBIN; priv->conf.failAlg = NG_ONE2MANY_FAIL_MANUAL; Modified: head/sys/netgraph/ng_pipe.c ============================================================================== --- head/sys/netgraph/ng_pipe.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_pipe.c Mon Apr 18 09:12:27 2011 (r220768) @@ -253,9 +253,7 @@ ngp_constructor(node_p node) { priv_p priv; - priv = malloc(sizeof(*priv), M_NG_PIPE, M_ZERO | M_NOWAIT); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NG_PIPE, M_ZERO | M_WAITOK); NG_NODE_SET_PRIVATE(node, priv); /* Mark node as single-threaded */ Modified: head/sys/netgraph/ng_ppp.c ============================================================================== --- head/sys/netgraph/ng_ppp.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_ppp.c Mon Apr 18 09:12:27 2011 (r220768) @@ -490,9 +490,7 @@ ng_ppp_constructor(node_p node) int i; /* Allocate private structure */ - priv = malloc(sizeof(*priv), M_NETGRAPH_PPP, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH_PPP, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); Modified: head/sys/netgraph/ng_pppoe.c ============================================================================== --- head/sys/netgraph/ng_pppoe.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_pppoe.c Mon Apr 18 09:12:27 2011 (r220768) @@ -611,9 +611,7 @@ ng_pppoe_constructor(node_p node) int i; /* Initialize private descriptor. */ - privp = malloc(sizeof(*privp), M_NETGRAPH_PPPOE, M_NOWAIT | M_ZERO); - if (privp == NULL) - return (ENOMEM); + privp = malloc(sizeof(*privp), M_NETGRAPH_PPPOE, M_WAITOK | M_ZERO); /* Link structs together; this counts as our one reference to *node. */ NG_NODE_SET_PRIVATE(node, privp); Modified: head/sys/netgraph/ng_pptpgre.c ============================================================================== --- head/sys/netgraph/ng_pptpgre.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_pptpgre.c Mon Apr 18 09:12:27 2011 (r220768) @@ -281,9 +281,7 @@ ng_pptpgre_constructor(node_p node) int i; /* Allocate private structure */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); Modified: head/sys/netgraph/ng_rfc1490.c ============================================================================== --- head/sys/netgraph/ng_rfc1490.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_rfc1490.c Mon Apr 18 09:12:27 2011 (r220768) @@ -165,9 +165,7 @@ ng_rfc1490_constructor(node_p node) priv_p priv; /* Allocate private structure */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); /* Initialize to default encapsulation method - ietf-ip */ priv->enc = ng_rfc1490_encaps; Modified: head/sys/netgraph/ng_sample.c ============================================================================== --- head/sys/netgraph/ng_sample.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_sample.c Mon Apr 18 09:12:27 2011 (r220768) @@ -154,10 +154,7 @@ ng_xxx_constructor(node_p node) int i; /* Initialize private descriptor */ - privdata = malloc(sizeof(*privdata), M_NETGRAPH, - M_NOWAIT | M_ZERO); - if (privdata == NULL) - return (ENOMEM); + privdata = malloc(sizeof(*privdata), M_NETGRAPH, M_WAITOK | M_ZERO); for (i = 0; i < XXX_NUM_DLCIS; i++) { privdata->channel[i].dlci = -2; privdata->channel[i].channel = i; Modified: head/sys/netgraph/ng_source.c ============================================================================== --- head/sys/netgraph/ng_source.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_source.c Mon Apr 18 09:12:27 2011 (r220768) @@ -273,9 +273,7 @@ ng_source_constructor(node_p node) { sc_p sc; - sc = malloc(sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (sc == NULL) - return (ENOMEM); + sc = malloc(sizeof(*sc), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, sc); sc->node = node; Modified: head/sys/netgraph/ng_split.c ============================================================================== --- head/sys/netgraph/ng_split.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_split.c Mon Apr 18 09:12:27 2011 (r220768) @@ -85,9 +85,7 @@ ng_split_constructor(node_p node) priv_p priv; /* Allocate node */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_ZERO | M_NOWAIT); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_ZERO | M_WAITOK); /* Link together node and private info */ NG_NODE_SET_PRIVATE(node, priv); Modified: head/sys/netgraph/ng_sppp.c ============================================================================== --- head/sys/netgraph/ng_sppp.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_sppp.c Mon Apr 18 09:12:27 2011 (r220768) @@ -248,9 +248,7 @@ ng_sppp_constructor (node_p node) int error = 0; /* Allocate node and interface private structures */ - priv = malloc (sizeof(*priv), M_NETGRAPH_SPPP, M_NOWAIT|M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH_SPPP, M_WAITOK | M_ZERO); ifp = if_alloc(IFT_PPP); if (ifp == NULL) { Modified: head/sys/netgraph/ng_tee.c ============================================================================== --- head/sys/netgraph/ng_tee.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_tee.c Mon Apr 18 09:12:27 2011 (r220768) @@ -153,9 +153,7 @@ ng_tee_constructor(node_p node) { sc_p privdata; - privdata = malloc(sizeof(*privdata), M_NETGRAPH, M_NOWAIT|M_ZERO); - if (privdata == NULL) - return (ENOMEM); + privdata = malloc(sizeof(*privdata), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, privdata); return (0); Modified: head/sys/netgraph/ng_tty.c ============================================================================== --- head/sys/netgraph/ng_tty.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_tty.c Mon Apr 18 09:12:27 2011 (r220768) @@ -156,9 +156,7 @@ ngt_constructor(node_p node) sc_p sc; /* Allocate private structure */ - sc = malloc(sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (sc == NULL) - return (ENOMEM); + sc = malloc(sizeof(*sc), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, sc); sc->node = node; Modified: head/sys/netgraph/ng_vjc.c ============================================================================== --- head/sys/netgraph/ng_vjc.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_vjc.c Mon Apr 18 09:12:27 2011 (r220768) @@ -243,9 +243,7 @@ ng_vjc_constructor(node_p node) priv_p priv; /* Allocate private structure */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); Modified: head/sys/netgraph/ng_vlan.c ============================================================================== --- head/sys/netgraph/ng_vlan.c Mon Apr 18 09:10:27 2011 (r220767) +++ head/sys/netgraph/ng_vlan.c Mon Apr 18 09:12:27 2011 (r220768) @@ -161,9 +161,7 @@ ng_vlan_constructor(node_p node) priv_p priv; int i; - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); - if (priv == NULL) - return (ENOMEM); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); for (i = 0; i < HASHSIZE; i++) LIST_INIT(&priv->hashtable[i]); NG_NODE_SET_PRIVATE(node, priv);