From: Sascha Wildner Date: Sat, 10 Dec 2011 15:34:30 +0000 (+0100) Subject: kernel/netgraph7: Replace usage of MALLOC/FREE with kmalloc/kfree here too. X-Git-Tag: v3.0.0~421^2~14 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/fc025606753a07c5a63d0d6b7d389182b49074f4 kernel/netgraph7: Replace usage of MALLOC/FREE with kmalloc/kfree here too. Requested-by: Nuno Antunes --- diff --git a/sys/netgraph7/atm/sscfu/ng_sscfu_cust.h b/sys/netgraph7/atm/sscfu/ng_sscfu_cust.h index 942fb28b8b..2624f3235f 100644 --- a/sys/netgraph7/atm/sscfu/ng_sscfu_cust.h +++ b/sys/netgraph7/atm/sscfu/ng_sscfu_cust.h @@ -72,13 +72,13 @@ #define MEMZALLOC(PTR, CAST, SIZE) \ ((PTR) = (CAST)kmalloc((SIZE), M_NG_SSCFU_INS, M_WAITOK | M_NULLOK | M_ZERO)) #define MEMFREE(PTR) \ - FREE(PTR, M_NG_SSCFU_INS) + kfree(PTR, M_NG_SSCFU_INS) #define SIG_ALLOC(PTR) \ ((PTR) = kmalloc(sizeof(struct sscfu_sig), \ M_NG_SSCFU_SIG, M_WAITOK | M_NULLOK | M_ZERO)) #define SIG_FREE(PTR) \ - FREE(PTR, M_NG_SSCFU_SIG) + kfree(PTR, M_NG_SSCFU_SIG) #endif diff --git a/sys/netgraph7/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph7/bluetooth/drivers/h4/ng_h4.c index 82412a81d4..b0032ca90d 100644 --- a/sys/netgraph7/bluetooth/drivers/h4/ng_h4.c +++ b/sys/netgraph7/bluetooth/drivers/h4/ng_h4.c @@ -162,7 +162,7 @@ ng_h4_open(struct cdev *dev, struct tty *tp) return (error); /* Initialize private struct */ - MALLOC(sc, ng_h4_info_p, sizeof(*sc), M_NETGRAPH_H4, M_WAITOK | M_NULLOK | M_ZERO); + sc = kmalloc(sizeof(*sc), M_NETGRAPH_H4, M_WAITOK | M_NULLOK | M_ZERO); if (sc == NULL) return (ENOMEM); @@ -189,7 +189,7 @@ ng_h4_open(struct cdev *dev, struct tty *tp) mtx_destroy(&sc->outq.ifq_mtx); bzero(sc, sizeof(*sc)); - FREE(sc, M_NETGRAPH_H4); + kfree(sc, M_NETGRAPH_H4); lwkt_reltoken(&tty_token); return (error); @@ -207,7 +207,7 @@ ng_h4_open(struct cdev *dev, struct tty *tp) NG_NODE_UNREF(sc->node); mtx_destroy(&sc->outq.ifq_mtx); bzero(sc, sizeof(*sc)); - FREE(sc, M_NETGRAPH_H4); + kfree(sc, M_NETGRAPH_H4); lwkt_reltoken(&tty_token); return (error); @@ -786,7 +786,7 @@ ng_h4_shutdown(node_p node) NG_NODE_UNREF(node); mtx_destroy(&sc->outq.ifq_mtx); bzero(sc, sizeof(*sc)); - FREE(sc, M_NETGRAPH_H4); + kfree(sc, M_NETGRAPH_H4); return (0); } /* ng_h4_shutdown */ diff --git a/sys/netgraph7/bluetooth/hci/ng_hci_main.c b/sys/netgraph7/bluetooth/hci/ng_hci_main.c index a29515ca4b..36bfd6fc19 100644 --- a/sys/netgraph7/bluetooth/hci/ng_hci_main.c +++ b/sys/netgraph7/bluetooth/hci/ng_hci_main.c @@ -110,8 +110,8 @@ ng_hci_constructor(node_p node) { ng_hci_unit_p unit = NULL; - MALLOC(unit, ng_hci_unit_p, sizeof(*unit), M_NETGRAPH_HCI, - M_WAITOK | M_NULLOK | M_ZERO); + unit = kmalloc(sizeof(*unit), M_NETGRAPH_HCI, + M_WAITOK | M_NULLOK | M_ZERO); if (unit == NULL) return (ENOMEM); @@ -171,7 +171,7 @@ ng_hci_shutdown(node_p node) NG_BT_MBUFQ_DESTROY(&unit->cmdq); bzero(unit, sizeof(*unit)); - FREE(unit, M_NETGRAPH_HCI); + kfree(unit, M_NETGRAPH_HCI); return (0); } /* ng_hci_shutdown */ diff --git a/sys/netgraph7/bluetooth/hci/ng_hci_misc.c b/sys/netgraph7/bluetooth/hci/ng_hci_misc.c index cb721f4391..b78b5c92f9 100644 --- a/sys/netgraph7/bluetooth/hci/ng_hci_misc.c +++ b/sys/netgraph7/bluetooth/hci/ng_hci_misc.c @@ -176,8 +176,7 @@ ng_hci_new_neighbor(ng_hci_unit_p unit) { ng_hci_neighbor_p n = NULL; - MALLOC(n, ng_hci_neighbor_p, sizeof(*n), M_NETGRAPH_HCI, - M_WAITOK | M_NULLOK | M_ZERO); + n = kmalloc(sizeof(*n), M_NETGRAPH_HCI, M_WAITOK | M_NULLOK | M_ZERO); if (n != NULL) { getmicrotime(&n->updated); LIST_INSERT_HEAD(&unit->neighbors, n, next); @@ -195,7 +194,7 @@ ng_hci_free_neighbor(ng_hci_neighbor_p n) { LIST_REMOVE(n, next); bzero(n, sizeof(*n)); - FREE(n, M_NETGRAPH_HCI); + kfree(n, M_NETGRAPH_HCI); } /* ng_hci_free_neighbor */ /* @@ -258,8 +257,8 @@ ng_hci_new_con(ng_hci_unit_p unit, int link_type) int num_pkts; static int fake_con_handle = 0x0f00; - MALLOC(con, ng_hci_unit_con_p, sizeof(*con), M_NETGRAPH_HCI, - M_WAITOK | M_NULLOK | M_ZERO); + con = kmalloc(sizeof(*con), M_NETGRAPH_HCI, + M_WAITOK | M_NULLOK | M_ZERO); if (con != NULL) { con->unit = unit; con->state = NG_HCI_CON_CLOSED; @@ -321,7 +320,7 @@ ng_hci_free_con(ng_hci_unit_con_p con) NG_BT_ITEMQ_DESTROY(&con->conq); bzero(con, sizeof(*con)); - FREE(con, M_NETGRAPH_HCI); + kfree(con, M_NETGRAPH_HCI); } /* ng_hci_free_con */ /* diff --git a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_main.c b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_main.c index a18e13fc45..8699ed8e15 100644 --- a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_main.c +++ b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_main.c @@ -114,8 +114,8 @@ ng_l2cap_constructor(node_p node) ng_l2cap_p l2cap = NULL; /* Create new L2CAP node */ - MALLOC(l2cap, ng_l2cap_p, sizeof(*l2cap), - M_NETGRAPH_L2CAP, M_WAITOK | M_NULLOK | M_ZERO); + l2cap = kmalloc(sizeof(*l2cap), M_NETGRAPH_L2CAP, + M_WAITOK | M_NULLOK | M_ZERO); if (l2cap == NULL) return (ENOMEM); @@ -149,7 +149,7 @@ ng_l2cap_shutdown(node_p node) ng_l2cap_cleanup(l2cap); bzero(l2cap, sizeof(*l2cap)); - FREE(l2cap, M_NETGRAPH_L2CAP); + kfree(l2cap, M_NETGRAPH_L2CAP); return (0); } /* ng_l2cap_shutdown */ diff --git a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.c index 56cce16934..4fecd82d37 100644 --- a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.c +++ b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.c @@ -105,8 +105,8 @@ ng_l2cap_new_con(ng_l2cap_p l2cap, bdaddr_p bdaddr) ng_l2cap_con_p con = NULL; /* Create new connection descriptor */ - MALLOC(con, ng_l2cap_con_p, sizeof(*con), M_NETGRAPH_L2CAP, - M_WAITOK | M_NULLOK | M_ZERO); + con = kmalloc(sizeof(*con), M_NETGRAPH_L2CAP, + M_WAITOK | M_NULLOK | M_ZERO); if (con == NULL) return (NULL); @@ -285,7 +285,7 @@ ng_l2cap_free_con(ng_l2cap_con_p con) LIST_REMOVE(con, next); bzero(con, sizeof(*con)); - FREE(con, M_NETGRAPH_L2CAP); + kfree(con, M_NETGRAPH_L2CAP); } /* ng_l2cap_free_con */ /* @@ -330,8 +330,8 @@ ng_l2cap_new_chan(ng_l2cap_p l2cap, ng_l2cap_con_p con, u_int16_t psm) { ng_l2cap_chan_p ch = NULL; - MALLOC(ch, ng_l2cap_chan_p, sizeof(*ch), M_NETGRAPH_L2CAP, - M_WAITOK | M_NULLOK | M_ZERO); + ch = kmalloc(sizeof(*ch), M_NETGRAPH_L2CAP, + M_WAITOK | M_NULLOK | M_ZERO); if (ch == NULL) return (NULL); @@ -358,7 +358,7 @@ ng_l2cap_new_chan(ng_l2cap_p l2cap, ng_l2cap_con_p con, u_int16_t psm) ng_l2cap_con_ref(con); } else { bzero(ch, sizeof(*ch)); - FREE(ch, M_NETGRAPH_L2CAP); + kfree(ch, M_NETGRAPH_L2CAP); ch = NULL; } @@ -409,7 +409,7 @@ ng_l2cap_free_chan(ng_l2cap_chan_p ch) ng_l2cap_con_unref(ch->con); bzero(ch, sizeof(*ch)); - FREE(ch, M_NETGRAPH_L2CAP); + kfree(ch, M_NETGRAPH_L2CAP); } /* ng_l2cap_free_chan */ /* @@ -426,8 +426,8 @@ ng_l2cap_new_cmd(ng_l2cap_con_p con, ng_l2cap_chan_p ch, u_int8_t ident, ("%s: %s - invalid channel pointer!\n", __func__, NG_NODE_NAME(con->l2cap->node))); - MALLOC(cmd, ng_l2cap_cmd_p, sizeof(*cmd), M_NETGRAPH_L2CAP, - M_WAITOK | M_NULLOK | M_ZERO); + cmd = kmalloc(sizeof(*cmd), M_NETGRAPH_L2CAP, + M_WAITOK | M_NULLOK | M_ZERO); if (cmd == NULL) return (NULL); diff --git a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.h b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.h index 87a1d870b7..d32f8dc52b 100644 --- a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.h +++ b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.h @@ -77,7 +77,7 @@ do { \ KASSERT(!callout_pending(&(cmd)->timo), ("Pending callout!")); \ NG_FREE_M((cmd)->aux); \ bzero((cmd), sizeof(*(cmd))); \ - FREE((cmd), M_NETGRAPH_L2CAP); \ + kfree((cmd), M_NETGRAPH_L2CAP); \ } while (0) ng_l2cap_cmd_p ng_l2cap_new_cmd (ng_l2cap_con_p, ng_l2cap_chan_p, diff --git a/sys/netgraph7/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph7/bluetooth/socket/ng_btsocket_hci_raw.c index ac8619d05b..99e92911f8 100644 --- a/sys/netgraph7/bluetooth/socket/ng_btsocket_hci_raw.c +++ b/sys/netgraph7/bluetooth/socket/ng_btsocket_hci_raw.c @@ -783,10 +783,9 @@ ng_btsocket_hci_raw_init(void) ng_btsocket_hci_raw_sec_filter = NULL; - MALLOC(ng_btsocket_hci_raw_sec_filter, - struct ng_btsocket_hci_raw_sec_filter *, - sizeof(struct ng_btsocket_hci_raw_sec_filter), - M_NETGRAPH_BTSOCKET_HCI_RAW, M_WAITOK | M_NULLOK | M_ZERO); + ng_btsocket_hci_raw_sec_filter = kmalloc(sizeof(struct ng_btsocket_hci_raw_sec_filter), + M_NETGRAPH_BTSOCKET_HCI_RAW, + M_WAITOK | M_NULLOK | M_ZERO); if (ng_btsocket_hci_raw_sec_filter == NULL) { printf("%s: Could not allocate security filter!\n", __func__); return; @@ -909,8 +908,8 @@ ng_btsocket_hci_raw_attach(struct socket *so, int proto, struct thread *td) if (error != 0) return (error); - MALLOC(pcb, ng_btsocket_hci_raw_pcb_p, sizeof(*pcb), - M_NETGRAPH_BTSOCKET_HCI_RAW, M_WAITOK | M_NULLOK | M_ZERO); + pcb = kmalloc(sizeof(*pcb), M_NETGRAPH_BTSOCKET_HCI_RAW, + M_WAITOK | M_NULLOK | M_ZERO); if (pcb == NULL) return (ENOMEM); @@ -1488,7 +1487,7 @@ ng_btsocket_hci_raw_detach(struct socket *so) mtx_destroy(&pcb->pcb_mtx); bzero(pcb, sizeof(*pcb)); - FREE(pcb, M_NETGRAPH_BTSOCKET_HCI_RAW); + kfree(pcb, M_NETGRAPH_BTSOCKET_HCI_RAW); so->so_pcb = NULL; } /* ng_btsocket_hci_raw_detach */ diff --git a/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap.c index a691b9dfe5..32029f193e 100644 --- a/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap.c +++ b/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap.c @@ -1557,8 +1557,8 @@ ng_btsocket_l2cap_default_msg_input(struct ng_mesg *msg, hook_p hook) rt = (ng_btsocket_l2cap_rtentry_t *) NG_HOOK_PRIVATE(hook); if (rt == NULL) { - MALLOC(rt, ng_btsocket_l2cap_rtentry_p, sizeof(*rt), - M_NETGRAPH_BTSOCKET_L2CAP, M_WAITOK | M_NULLOK | M_ZERO); + rt = kmalloc(sizeof(*rt), M_NETGRAPH_BTSOCKET_L2CAP, + M_WAITOK | M_NULLOK | M_ZERO); if (rt == NULL) { mtx_unlock(&ng_btsocket_l2cap_rt_mtx); break; @@ -1782,7 +1782,7 @@ ng_btsocket_l2cap_rtclean(void *context, int pending) NG_HOOK_UNREF(rt->hook); /* Remove extra reference */ bzero(rt, sizeof(*rt)); - FREE(rt, M_NETGRAPH_BTSOCKET_L2CAP); + kfree(rt, M_NETGRAPH_BTSOCKET_L2CAP); } rt = rt_next; @@ -1924,8 +1924,8 @@ ng_btsocket_l2cap_attach(struct socket *so, int proto, struct thread *td) } /* Allocate the PCB */ - MALLOC(pcb, ng_btsocket_l2cap_pcb_p, sizeof(*pcb), - M_NETGRAPH_BTSOCKET_L2CAP, M_WAITOK | M_NULLOK | M_ZERO); + pcb = kmalloc(sizeof(*pcb), M_NETGRAPH_BTSOCKET_L2CAP, + M_WAITOK | M_NULLOK | M_ZERO); if (pcb == NULL) return (ENOMEM); @@ -2304,7 +2304,7 @@ ng_btsocket_l2cap_detach(struct socket *so) mtx_destroy(&pcb->pcb_mtx); bzero(pcb, sizeof(*pcb)); - FREE(pcb, M_NETGRAPH_BTSOCKET_L2CAP); + kfree(pcb, M_NETGRAPH_BTSOCKET_L2CAP); soisdisconnected(so); so->so_pcb = NULL; diff --git a/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap_raw.c index 7b2bb07113..20f74b7225 100644 --- a/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap_raw.c +++ b/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap_raw.c @@ -371,10 +371,9 @@ ng_btsocket_l2cap_raw_input(void *context, int pending) rt = (ng_btsocket_l2cap_rtentry_t *) NG_HOOK_PRIVATE(hook); if (rt == NULL) { - MALLOC(rt, ng_btsocket_l2cap_rtentry_p, - sizeof(*rt), - M_NETGRAPH_BTSOCKET_L2CAP_RAW, - M_WAITOK | M_NULLOK | M_ZERO); + rt = kmalloc(sizeof(*rt), + M_NETGRAPH_BTSOCKET_L2CAP_RAW, + M_WAITOK | M_NULLOK | M_ZERO); if (rt == NULL) break; @@ -490,7 +489,7 @@ ng_btsocket_l2cap_raw_rtclean(void *context, int pending) NG_HOOK_UNREF(rt->hook); /* Remove extra reference */ bzero(rt, sizeof(*rt)); - FREE(rt, M_NETGRAPH_BTSOCKET_L2CAP_RAW); + kfree(rt, M_NETGRAPH_BTSOCKET_L2CAP_RAW); } rt = rt_next; @@ -612,8 +611,8 @@ ng_btsocket_l2cap_raw_attach(struct socket *so, int proto, struct thread *td) return (error); /* Allocate the PCB */ - MALLOC(pcb, ng_btsocket_l2cap_raw_pcb_p, sizeof(*pcb), - M_NETGRAPH_BTSOCKET_L2CAP_RAW, M_WAITOK | M_NULLOK | M_ZERO); + pcb = kmalloc(sizeof(*pcb), M_NETGRAPH_BTSOCKET_L2CAP_RAW, + M_WAITOK | M_NULLOK | M_ZERO); if (pcb == NULL) return (ENOMEM); @@ -1123,7 +1122,7 @@ ng_btsocket_l2cap_raw_detach(struct socket *so) mtx_destroy(&pcb->pcb_mtx); bzero(pcb, sizeof(*pcb)); - FREE(pcb, M_NETGRAPH_BTSOCKET_L2CAP_RAW); + kfree(pcb, M_NETGRAPH_BTSOCKET_L2CAP_RAW); so->so_pcb = NULL; } /* ng_btsocket_l2cap_raw_detach */ diff --git a/sys/netgraph7/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph7/bluetooth/socket/ng_btsocket_rfcomm.c index 6d7f34bb90..1e58ad5390 100644 --- a/sys/netgraph7/bluetooth/socket/ng_btsocket_rfcomm.c +++ b/sys/netgraph7/bluetooth/socket/ng_btsocket_rfcomm.c @@ -399,8 +399,8 @@ ng_btsocket_rfcomm_attach(struct socket *so, int proto, struct thread *td) } /* Allocate the PCB */ - MALLOC(pcb, ng_btsocket_rfcomm_pcb_p, sizeof(*pcb), - M_NETGRAPH_BTSOCKET_RFCOMM, M_WAITOK | M_NULLOK | M_ZERO); + pcb = kmalloc(sizeof(*pcb), M_NETGRAPH_BTSOCKET_RFCOMM, + M_WAITOK | M_NULLOK | M_ZERO); if (pcb == NULL) return (ENOMEM); @@ -747,7 +747,7 @@ ng_btsocket_rfcomm_detach(struct socket *so) mtx_destroy(&pcb->pcb_mtx); bzero(pcb, sizeof(*pcb)); - FREE(pcb, M_NETGRAPH_BTSOCKET_RFCOMM); + kfree(pcb, M_NETGRAPH_BTSOCKET_RFCOMM); soisdisconnected(so); sofree(so); /* for so_pcb = NULL */ @@ -1065,7 +1065,7 @@ ng_btsocket_rfcomm_sessions_task(void *ctx, int pending) mtx_destroy(&s->session_mtx); bzero(s, sizeof(*s)); - FREE(s, M_NETGRAPH_BTSOCKET_RFCOMM); + kfree(s, M_NETGRAPH_BTSOCKET_RFCOMM); } else mtx_unlock(&s->session_mtx); @@ -1266,8 +1266,8 @@ ng_btsocket_rfcomm_session_create(ng_btsocket_rfcomm_session_p *sp, mtx_assert(&ng_btsocket_rfcomm_sessions_mtx, MA_OWNED); /* Allocate the RFCOMM session */ - MALLOC(s, ng_btsocket_rfcomm_session_p, sizeof(*s), - M_NETGRAPH_BTSOCKET_RFCOMM, M_WAITOK | M_NULLOK | M_ZERO); + s = kmalloc(sizeof(*s), M_NETGRAPH_BTSOCKET_RFCOMM, + M_WAITOK | M_NULLOK | M_ZERO); if (s == NULL) return (ENOMEM); @@ -1386,7 +1386,7 @@ bad: mtx_destroy(&s->session_mtx); bzero(s, sizeof(*s)); - FREE(s, M_NETGRAPH_BTSOCKET_RFCOMM); + kfree(s, M_NETGRAPH_BTSOCKET_RFCOMM); return (error); } /* ng_btsocket_rfcomm_session_create */ diff --git a/sys/netgraph7/netflow/netflow.c b/sys/netgraph7/netflow/netflow.c index 9bc2525be7..b3a35006d5 100644 --- a/sys/netgraph7/netflow/netflow.c +++ b/sys/netgraph7/netflow/netflow.c @@ -330,9 +330,8 @@ ng_netflow_cache_init(priv_p priv) uma_zone_set_max(priv->zone, CACHESIZE); /* Allocate hash. */ - MALLOC(priv->hash, struct flow_hash_entry *, - NBUCKETS * sizeof(struct flow_hash_entry), - M_NETFLOW_HASH, M_WAITOK | M_ZERO); + priv->hash = kmalloc(NBUCKETS * sizeof(struct flow_hash_entry), + M_NETFLOW_HASH, M_WAITOK | M_ZERO); if (priv->hash == NULL) { uma_zdestroy(priv->zone); @@ -381,7 +380,7 @@ ng_netflow_cache_flush(priv_p priv) /* Free hash memory. */ if (priv->hash) - FREE(priv->hash, M_NETFLOW_HASH); + kfree(priv->hash, M_NETFLOW_HASH); mtx_destroy(&priv->export_mtx); } diff --git a/sys/netgraph7/netflow/ng_netflow.c b/sys/netgraph7/netflow/ng_netflow.c index b2bf46393b..d28f0b7e7d 100644 --- a/sys/netgraph7/netflow/ng_netflow.c +++ b/sys/netgraph7/netflow/ng_netflow.c @@ -169,7 +169,7 @@ ng_netflow_constructor(node_p node) int error = 0; /* Initialize private data */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK); if (priv == NULL) return (ENOMEM); bzero(priv, sizeof(*priv)); @@ -629,7 +629,7 @@ ng_netflow_rmnode(node_p node) NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(priv->node); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); return (0); } diff --git a/sys/netgraph7/netgraph.h b/sys/netgraph7/netgraph.h index aec5274368..6e73f55692 100644 --- a/sys/netgraph7/netgraph.h +++ b/sys/netgraph7/netgraph.h @@ -917,7 +917,7 @@ _ngi_hook(item_p item, char *file, int line) #define NG_FREE_MSG(msg) \ do { \ if ((msg)) { \ - FREE((msg), M_NETGRAPH_MSG); \ + kfree((msg), M_NETGRAPH_MSG); \ (msg) = NULL; \ } \ } while (0) diff --git a/sys/netgraph7/ng_UI.c b/sys/netgraph7/ng_UI.c index a0b1e90ae9..e98596de7b 100644 --- a/sys/netgraph7/ng_UI.c +++ b/sys/netgraph7/ng_UI.c @@ -104,7 +104,8 @@ ng_UI_constructor(node_p node) priv_p priv; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) { return (ENOMEM); } @@ -216,7 +217,7 @@ ng_UI_shutdown(node_p node) const priv_p priv = NG_NODE_PRIVATE(node); /* Take down netgraph node */ - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); return (0); diff --git a/sys/netgraph7/ng_async.c b/sys/netgraph7/ng_async.c index d53f824bec..c9e7eed253 100644 --- a/sys/netgraph7/ng_async.c +++ b/sys/netgraph7/ng_async.c @@ -184,23 +184,24 @@ nga_constructor(node_p node) { sc_p sc; - MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH_ASYNC, M_WAITOK | M_NULLOK | M_ZERO); + sc = kmalloc(sizeof(*sc), M_NETGRAPH_ASYNC, + M_WAITOK | M_NULLOK | M_ZERO); if (sc == NULL) return (ENOMEM); sc->amode = MODE_HUNT; sc->cfg.accm = ~0; sc->cfg.amru = NG_ASYNC_DEFAULT_MRU; sc->cfg.smru = NG_ASYNC_DEFAULT_MRU; - MALLOC(sc->abuf, u_char *, - ASYNC_BUF_SIZE(sc->cfg.smru), M_NETGRAPH_ASYNC, M_WAITOK | M_NULLOK); + sc->abuf = kmalloc(ASYNC_BUF_SIZE(sc->cfg.smru), M_NETGRAPH_ASYNC, + M_WAITOK | M_NULLOK); if (sc->abuf == NULL) goto fail; - MALLOC(sc->sbuf, u_char *, - SYNC_BUF_SIZE(sc->cfg.amru), M_NETGRAPH_ASYNC, M_WAITOK | M_NULLOK); + sc->sbuf = kmalloc(SYNC_BUF_SIZE(sc->cfg.amru), M_NETGRAPH_ASYNC, + M_WAITOK | M_NULLOK); if (sc->sbuf == NULL) { - FREE(sc->abuf, M_NETGRAPH_ASYNC); + kfree(sc->abuf, M_NETGRAPH_ASYNC); fail: - FREE(sc, M_NETGRAPH_ASYNC); + kfree(sc, M_NETGRAPH_ASYNC); return (ENOMEM); } NG_NODE_SET_PRIVATE(node, sc); @@ -299,19 +300,21 @@ nga_rcvmsg(node_p node, item_p item, hook_p lasthook) ERROUT(EINVAL); cfg->enabled = !!cfg->enabled; /* normalize */ if (cfg->smru > sc->cfg.smru) { /* reallocate buffer */ - MALLOC(buf, u_char *, ASYNC_BUF_SIZE(cfg->smru), - M_NETGRAPH_ASYNC, M_WAITOK | M_NULLOK); + buf = kmalloc(ASYNC_BUF_SIZE(cfg->smru), + M_NETGRAPH_ASYNC, + M_WAITOK | M_NULLOK); if (!buf) ERROUT(ENOMEM); - FREE(sc->abuf, M_NETGRAPH_ASYNC); + kfree(sc->abuf, M_NETGRAPH_ASYNC); sc->abuf = buf; } if (cfg->amru > sc->cfg.amru) { /* reallocate buffer */ - MALLOC(buf, u_char *, SYNC_BUF_SIZE(cfg->amru), - M_NETGRAPH_ASYNC, M_WAITOK | M_NULLOK); + buf = kmalloc(SYNC_BUF_SIZE(cfg->amru), + M_NETGRAPH_ASYNC, + M_WAITOK | M_NULLOK); if (!buf) ERROUT(ENOMEM); - FREE(sc->sbuf, M_NETGRAPH_ASYNC); + kfree(sc->sbuf, M_NETGRAPH_ASYNC); sc->sbuf = buf; sc->amode = MODE_HUNT; sc->slen = 0; @@ -350,10 +353,10 @@ nga_shutdown(node_p node) { const sc_p sc = NG_NODE_PRIVATE(node); - FREE(sc->abuf, M_NETGRAPH_ASYNC); - FREE(sc->sbuf, M_NETGRAPH_ASYNC); + kfree(sc->abuf, M_NETGRAPH_ASYNC); + kfree(sc->sbuf, M_NETGRAPH_ASYNC); bzero(sc, sizeof(*sc)); - FREE(sc, M_NETGRAPH_ASYNC); + kfree(sc, M_NETGRAPH_ASYNC); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); return (0); diff --git a/sys/netgraph7/ng_atmllc.c b/sys/netgraph7/ng_atmllc.c index 1cfd2d40b7..b7ce9f8481 100644 --- a/sys/netgraph7/ng_atmllc.c +++ b/sys/netgraph7/ng_atmllc.c @@ -81,8 +81,8 @@ ng_atmllc_constructor(node_p node) { struct ng_atmllc_priv *priv; - MALLOC(priv, struct ng_atmllc_priv *, sizeof(*priv), M_NETGRAPH, - M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) { return (ENOMEM); } @@ -112,7 +112,7 @@ ng_atmllc_shutdown(node_p node) priv = NG_NODE_PRIVATE(node); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); NG_NODE_UNREF(node); diff --git a/sys/netgraph7/ng_base.c b/sys/netgraph7/ng_base.c index 3b19fae545..123eaffc23 100644 --- a/sys/netgraph7/ng_base.c +++ b/sys/netgraph7/ng_base.c @@ -235,9 +235,11 @@ MALLOC_DEFINE(M_NETGRAPH_MSG, "netgraph_msg", "netgraph name storage"); /* Should not be visible outside this file */ #define _NG_ALLOC_HOOK(hook) \ - MALLOC(hook, hook_p, sizeof(*hook), M_NETGRAPH_HOOK, M_WAITOK | M_NULLOK | M_ZERO) + hook = kmalloc(sizeof(*hook), M_NETGRAPH_HOOK, \ + M_WAITOK | M_NULLOK | M_ZERO) #define _NG_ALLOC_NODE(node) \ - MALLOC(node, node_p, sizeof(*node), M_NETGRAPH_NODE, M_WAITOK | M_NULLOK | M_ZERO) + node = kmalloc(sizeof(*node), M_NETGRAPH_NODE, \ + M_WAITOK | M_NULLOK | M_ZERO) #define NG_QUEUE_LOCK_INIT(n) \ mtx_init(&(n)->q_mtx, "ng_node", NULL, MTX_DEF) @@ -340,8 +342,8 @@ ng_alloc_node(void) #define NG_ALLOC_HOOK(hook) _NG_ALLOC_HOOK(hook) #define NG_ALLOC_NODE(node) _NG_ALLOC_NODE(node) -#define NG_FREE_HOOK(hook) do { FREE((hook), M_NETGRAPH_HOOK); } while (0) -#define NG_FREE_NODE(node) do { FREE((node), M_NETGRAPH_NODE); } while (0) +#define NG_FREE_HOOK(hook) do { kfree((hook), M_NETGRAPH_HOOK); } while (0) +#define NG_FREE_NODE(node) do { kfree((node), M_NETGRAPH_NODE); } while (0) #endif /* NETGRAPH_DEBUG */ /*----------------------------------------------*/ diff --git a/sys/netgraph7/ng_bpf.c b/sys/netgraph7/ng_bpf.c index 925d7c1905..0b9b75730b 100644 --- a/sys/netgraph7/ng_bpf.c +++ b/sys/netgraph7/ng_bpf.c @@ -275,7 +275,8 @@ ng_bpf_newhook(node_p node, hook_p hook, const char *name) int error; /* Create hook private structure */ - MALLOC(hip, hinfo_p, sizeof(*hip), M_NETGRAPH_BPF, M_WAITOK | M_NULLOK | M_ZERO); + hip = kmalloc(sizeof(*hip), M_NETGRAPH_BPF, + M_WAITOK | M_NULLOK | M_ZERO); if (hip == NULL) return (ENOMEM); hip->hook = hook; @@ -286,7 +287,7 @@ ng_bpf_newhook(node_p node, hook_p hook, const char *name) /* Attach the default BPF program */ if ((error = ng_bpf_setprog(hook, &ng_bpf_default_prog)) != 0) { - FREE(hip, M_NETGRAPH_BPF); + kfree(hip, M_NETGRAPH_BPF); NG_HOOK_SET_PRIVATE(hook, NULL); return (error); } @@ -443,7 +444,7 @@ ng_bpf_rcvdata(hook_p hook, item_p item) /* Need to put packet in contiguous memory for bpf */ if (m->m_next != NULL && totlen > MHLEN) { if (usejit) { - MALLOC(data, u_char *, totlen, M_NETGRAPH_BPF, M_NOWAIT); + data = kmalloc(totlen, M_NETGRAPH_BPF, M_NOWAIT); if (data == NULL) { NG_FREE_ITEM(item); return (ENOMEM); @@ -473,7 +474,7 @@ ng_bpf_rcvdata(hook_p hook, item_p item) else len = bpf_filter(hip->prog->bpf_prog, (u_char *)m, totlen, 0); if (needfree) - FREE(data, M_NETGRAPH_BPF); + kfree(data, M_NETGRAPH_BPF); ready: /* See if we got a match and find destination hook */ if (len > 0) { @@ -530,12 +531,12 @@ ng_bpf_disconnect(hook_p hook) /* Remove our reference from other hooks data. */ NG_NODE_FOREACH_HOOK(node, ng_bpf_remrefs, hook, tmp); - FREE(hip->prog, M_NETGRAPH_BPF); + kfree(hip->prog, M_NETGRAPH_BPF); #ifdef BPF_JITTER if (hip->jit_prog != NULL) bpf_destroy_jit_filter(hip->jit_prog); #endif - FREE(hip, M_NETGRAPH_BPF); + kfree(hip, M_NETGRAPH_BPF); if ((NG_NODE_NUMHOOKS(node) == 0) && (NG_NODE_IS_VALID(node))) { ng_rmnode_self(node); @@ -566,7 +567,7 @@ ng_bpf_setprog(hook_p hook, const struct ng_bpf_hookprog *hp0) /* Make a copy of the program */ size = NG_BPF_HOOKPROG_SIZE(hp0->bpf_prog_len); - MALLOC(hp, struct ng_bpf_hookprog *, size, M_NETGRAPH_BPF, M_NOWAIT); + hp = kmalloc(size, M_NETGRAPH_BPF, M_NOWAIT); if (hp == NULL) return (ENOMEM); bcopy(hp0, hp, size); @@ -576,7 +577,7 @@ ng_bpf_setprog(hook_p hook, const struct ng_bpf_hookprog *hp0) /* Free previous program, if any, and assign new one */ if (hip->prog != NULL) - FREE(hip->prog, M_NETGRAPH_BPF); + kfree(hip->prog, M_NETGRAPH_BPF); hip->prog = hp; #ifdef BPF_JITTER if (hip->jit_prog != NULL) diff --git a/sys/netgraph7/ng_bridge.c b/sys/netgraph7/ng_bridge.c index 0a1afdf194..140eb79736 100644 --- a/sys/netgraph7/ng_bridge.c +++ b/sys/netgraph7/ng_bridge.c @@ -298,16 +298,17 @@ ng_bridge_constructor(node_p node) priv_p priv; /* Allocate and initialize private info */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_BRIDGE, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH_BRIDGE, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); ng_callout_init(&priv->timer); /* Allocate and initialize hash table, etc. */ - MALLOC(priv->tab, struct ng_bridge_bucket *, - MIN_BUCKETS * sizeof(*priv->tab), M_NETGRAPH_BRIDGE, M_WAITOK | M_NULLOK | M_ZERO); + priv->tab = kmalloc(MIN_BUCKETS * sizeof(*priv->tab), + M_NETGRAPH_BRIDGE, M_WAITOK | M_NULLOK | M_ZERO); if (priv->tab == NULL) { - FREE(priv, M_NETGRAPH_BRIDGE); + kfree(priv, M_NETGRAPH_BRIDGE); return (ENOMEM); } priv->numBuckets = MIN_BUCKETS; @@ -359,8 +360,9 @@ ng_bridge_newhook(node_p node, hook_p hook, const char *name) return (EINVAL); if (priv->links[linkNum] != NULL) return (EISCONN); - MALLOC(priv->links[linkNum], struct ng_bridge_link *, - sizeof(*priv->links[linkNum]), M_NETGRAPH_BRIDGE, M_WAITOK | M_NULLOK | M_ZERO); + priv->links[linkNum] = kmalloc(sizeof(*priv->links[linkNum]), + M_NETGRAPH_BRIDGE, + M_WAITOK | M_NULLOK | M_ZERO); if (priv->links[linkNum] == NULL) return (ENOMEM); priv->links[linkNum]->hook = hook; @@ -767,8 +769,8 @@ ng_bridge_shutdown(node_p node) ng_uncallout(&priv->timer, node); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); - FREE(priv->tab, M_NETGRAPH_BRIDGE); - FREE(priv, M_NETGRAPH_BRIDGE); + kfree(priv->tab, M_NETGRAPH_BRIDGE); + kfree(priv, M_NETGRAPH_BRIDGE); return (0); } @@ -791,7 +793,7 @@ ng_bridge_disconnect(hook_p hook) /* Free associated link information */ KASSERT(priv->links[linkNum] != NULL, ("%s: no link", __func__)); - FREE(priv->links[linkNum], M_NETGRAPH_BRIDGE); + kfree(priv->links[linkNum], M_NETGRAPH_BRIDGE); priv->links[linkNum] = NULL; priv->numLinks--; @@ -850,8 +852,7 @@ ng_bridge_put(priv_p priv, const u_char *addr, int linkNum) #endif /* Allocate and initialize new hashtable entry */ - MALLOC(hent, struct ng_bridge_hent *, - sizeof(*hent), M_NETGRAPH_BRIDGE, M_WAITOK | M_NULLOK); + hent = kmalloc(sizeof(*hent), M_NETGRAPH_BRIDGE, M_WAITOK | M_NULLOK); if (hent == NULL) return (0); bcopy(addr, hent->host.addr, ETHER_ADDR_LEN); @@ -895,8 +896,8 @@ ng_bridge_rehash(priv_p priv) newMask = newNumBuckets - 1; /* Allocate and initialize new table */ - MALLOC(newTab, struct ng_bridge_bucket *, - newNumBuckets * sizeof(*newTab), M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO); + newTab = kmalloc(newNumBuckets * sizeof(*newTab), M_NETGRAPH_BRIDGE, + M_NOWAIT | M_ZERO); if (newTab == NULL) return; @@ -920,7 +921,7 @@ ng_bridge_rehash(priv_p priv) ng_bridge_nodename(priv->node), priv->numBuckets, newNumBuckets); } - FREE(priv->tab, M_NETGRAPH_BRIDGE); + kfree(priv->tab, M_NETGRAPH_BRIDGE); priv->numBuckets = newNumBuckets; priv->hashMask = newMask; priv->tab = newTab; @@ -948,7 +949,7 @@ ng_bridge_remove_hosts(priv_p priv, int linkNum) if (linkNum == -1 || hent->host.linkNum == linkNum) { *hptr = SLIST_NEXT(hent, next); - FREE(hent, M_NETGRAPH_BRIDGE); + kfree(hent, M_NETGRAPH_BRIDGE); priv->numHosts--; } else hptr = &SLIST_NEXT(hent, next); @@ -986,7 +987,7 @@ ng_bridge_timeout(node_p node, hook_p hook, void *arg1, int arg2) /* Remove hosts we haven't heard from in a while */ if (++hent->host.staleness >= priv->conf.maxStaleness) { *hptr = SLIST_NEXT(hent, next); - FREE(hent, M_NETGRAPH_BRIDGE); + kfree(hent, M_NETGRAPH_BRIDGE); priv->numHosts--; } else { if (hent->host.age < 0xffff) diff --git a/sys/netgraph7/ng_cisco.c b/sys/netgraph7/ng_cisco.c index 2a3e93bf0a..933504704f 100644 --- a/sys/netgraph7/ng_cisco.c +++ b/sys/netgraph7/ng_cisco.c @@ -190,7 +190,7 @@ cisco_constructor(node_p node) { sc_p sc; - MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + sc = kmalloc(sizeof(*sc), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); if (sc == NULL) return (ENOMEM); @@ -398,7 +398,7 @@ cisco_shutdown(node_p node) NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(sc->node); - FREE(sc, M_NETGRAPH); + kfree(sc, M_NETGRAPH); return (0); } diff --git a/sys/netgraph7/ng_device.c b/sys/netgraph7/ng_device.c index 8d21d94fdb..58f7487154 100644 --- a/sys/netgraph7/ng_device.c +++ b/sys/netgraph7/ng_device.c @@ -163,7 +163,7 @@ ng_device_constructor(node_p node) DBG; - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -186,7 +186,7 @@ ng_device_constructor(node_p node) mtx_destroy(&priv->ngd_mtx); mtx_destroy(&priv->readq.ifq_mtx); free_unr(ngd_unit, priv->unit); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); return(EINVAL); } /* XXX: race here? */ @@ -307,7 +307,7 @@ ng_device_disconnect(hook_p hook) free_unr(ngd_unit, priv->unit); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); ng_rmnode_self(NG_HOOK_NODE(hook)); diff --git a/sys/netgraph7/ng_eiface.c b/sys/netgraph7/ng_eiface.c index dcdbc6cc69..6c9289d809 100644 --- a/sys/netgraph7/ng_eiface.c +++ b/sys/netgraph7/ng_eiface.c @@ -338,7 +338,8 @@ ng_eiface_constructor(node_p node) u_char eaddr[6] = {0,0,0,0,0,0}; /* Allocate node and interface private structures */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -551,7 +552,7 @@ ng_eiface_rmnode(node_p node) ether_ifdetach(ifp); if_free(ifp); free_unr(ng_eiface_unit, priv->unit); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); return (0); diff --git a/sys/netgraph7/ng_etf.c b/sys/netgraph7/ng_etf.c index 7d4041c515..8c52f2314f 100644 --- a/sys/netgraph7/ng_etf.c +++ b/sys/netgraph7/ng_etf.c @@ -181,8 +181,8 @@ ng_etf_constructor(node_p node) int i; /* Initialize private descriptor */ - MALLOC(privdata, etf_p, sizeof(*privdata), M_NETGRAPH_ETF, - M_WAITOK | M_NULLOK | M_ZERO); + privdata = kmalloc(sizeof(*privdata), M_NETGRAPH_ETF, + M_WAITOK | M_NULLOK | M_ZERO); if (privdata == NULL) return (ENOMEM); for (i = 0; i < HASHSIZE; i++) { @@ -218,8 +218,8 @@ ng_etf_newhook(node_p node, hook_p hook, const char *name) * Any other hook name is valid and can * later be associated with a filter rule. */ - MALLOC(hpriv, struct ETF_hookinfo *, sizeof(*hpriv), - M_NETGRAPH_ETF, M_WAITOK | M_NULLOK | M_ZERO); + hpriv = kmalloc(sizeof(*hpriv), M_NETGRAPH_ETF, + M_WAITOK | M_NULLOK | M_ZERO); if (hpriv == NULL) { return (ENOMEM); } @@ -318,8 +318,8 @@ ng_etf_rcvmsg(node_p node, item_p item, hook_p lasthook) * Ok, make the filter and put it in the * hashtable ready for matching. */ - MALLOC(fil, struct filter *, sizeof(*fil), - M_NETGRAPH_ETF, M_WAITOK | M_NULLOK | M_ZERO); + fil = kmalloc(sizeof(*fil), M_NETGRAPH_ETF, + M_WAITOK | M_NULLOK | M_ZERO); if (fil == NULL) { error = ENOMEM; break; @@ -441,7 +441,7 @@ ng_etf_shutdown(node_p node) NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(privdata->node); - FREE(privdata, M_NETGRAPH_ETF); + kfree(privdata, M_NETGRAPH_ETF); return (0); } @@ -464,7 +464,7 @@ ng_etf_disconnect(hook_p hook) fil2 = LIST_NEXT(fil1, next); if (fil1->match_hook == hook) { LIST_REMOVE(fil1, next); - FREE(fil1, M_NETGRAPH_ETF); + kfree(fil1, M_NETGRAPH_ETF); } fil1 = fil2; } @@ -477,7 +477,7 @@ ng_etf_disconnect(hook_p hook) etfp->nomatch_hook.hook = NULL; } else { if (NG_HOOK_PRIVATE(hook)) /* Paranoia */ - FREE(NG_HOOK_PRIVATE(hook), M_NETGRAPH_ETF); + kfree(NG_HOOK_PRIVATE(hook), M_NETGRAPH_ETF); } NG_HOOK_SET_PRIVATE(hook, NULL); diff --git a/sys/netgraph7/ng_ether.c b/sys/netgraph7/ng_ether.c index 910f128d5a..7640ffff3d 100644 --- a/sys/netgraph7/ng_ether.c +++ b/sys/netgraph7/ng_ether.c @@ -292,7 +292,8 @@ ng_ether_attach(struct ifnet *ifp) } /* Allocate private data */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) { log(LOG_ERR, "%s: can't %s for %s\n", __func__, "allocate memory", ifp->if_xname); @@ -683,7 +684,7 @@ ng_ether_shutdown(node_p node) * Assume the ifp has already been freed. */ NG_NODE_SET_PRIVATE(node, NULL); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); NG_NODE_UNREF(node); /* free node itself */ return (0); } diff --git a/sys/netgraph7/ng_fec.c b/sys/netgraph7/ng_fec.c index 039743d204..e3acef3313 100644 --- a/sys/netgraph7/ng_fec.c +++ b/sys/netgraph7/ng_fec.c @@ -285,8 +285,8 @@ ng_fec_get_unit(int *unit) int i, *newarray, newlen; newlen = (2 * ng_fec_units_len) + 4; - MALLOC(newarray, int *, newlen * sizeof(*ng_fec_units), - M_NETGRAPH, M_WAITOK | M_NULLOK); + newarray = kmalloc(newlen * sizeof(*ng_fec_units), + M_NETGRAPH, M_WAITOK | M_NULLOK); if (newarray == NULL) { mtx_unlock(&ng_fec_mtx); return (ENOMEM); @@ -296,7 +296,7 @@ ng_fec_get_unit(int *unit) for (i = ng_fec_units_len; i < newlen; i++) newarray[i] = ~0; if (ng_fec_units != NULL) - FREE(ng_fec_units, M_NETGRAPH); + kfree(ng_fec_units, M_NETGRAPH); ng_fec_units = newarray; ng_fec_units_len = newlen; } @@ -334,7 +334,7 @@ ng_fec_free_unit(int unit) */ ng_units_in_use--; if (ng_units_in_use == 0) { /* XXX make SMP safe */ - FREE(ng_fec_units, M_NETGRAPH); + kfree(ng_fec_units, M_NETGRAPH); ng_fec_units_len = 0; ng_fec_units = NULL; } @@ -404,8 +404,8 @@ ng_fec_addport(struct ng_fec_private *priv, char *iface) } /* Allocate new list entry. */ - MALLOC(new, struct ng_fec_portlist *, - sizeof(struct ng_fec_portlist), M_NETGRAPH, M_WAITOK | M_NULLOK); + new = kmalloc(sizeof(struct ng_fec_portlist), M_NETGRAPH, + M_WAITOK | M_NULLOK); if (new == NULL) return(ENOMEM); @@ -512,7 +512,7 @@ ng_fec_delport(struct ng_fec_private *priv, char *iface) /* Delete port */ TAILQ_REMOVE(&b->ng_fec_ports, p, fec_list); - FREE(p, M_NETGRAPH); + kfree(p, M_NETGRAPH); b->fec_ifcnt--; if (b->fec_ifcnt == 0) @@ -1197,13 +1197,14 @@ ng_fec_constructor(node_p node) int error = 0; /* Allocate node and interface private structures */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); ifp = priv->ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); return (ENOSPC); } b = &priv->fec_bundle; @@ -1214,7 +1215,7 @@ ng_fec_constructor(node_p node) /* Get an interface unit number */ if ((error = ng_fec_get_unit(&priv->unit)) != 0) { if_free(ifp); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); return (error); } @@ -1338,7 +1339,7 @@ ng_fec_shutdown(node_p node) if_free_type(priv->ifp, IFT_ETHER); ifmedia_removeall(&priv->ifmedia); ng_fec_free_unit(priv->unit); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); return (0); diff --git a/sys/netgraph7/ng_frame_relay.c b/sys/netgraph7/ng_frame_relay.c index f76ee6aa75..7eac40f53e 100644 --- a/sys/netgraph7/ng_frame_relay.c +++ b/sys/netgraph7/ng_frame_relay.c @@ -213,7 +213,7 @@ ngfrm_constructor(node_p node) { sc_p sc; - MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + sc = kmalloc(sizeof(*sc), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); if (!sc) return (ENOMEM); sc->addrlen = 2; /* default */ @@ -482,7 +482,7 @@ ngfrm_shutdown(node_p node) const sc_p sc = NG_NODE_PRIVATE(node); NG_NODE_SET_PRIVATE(node, NULL); - FREE(sc, M_NETGRAPH); + kfree(sc, M_NETGRAPH); NG_NODE_UNREF(node); return (0); } diff --git a/sys/netgraph7/ng_gif.c b/sys/netgraph7/ng_gif.c index 3974c694e3..1d32e253c9 100644 --- a/sys/netgraph7/ng_gif.c +++ b/sys/netgraph7/ng_gif.c @@ -241,7 +241,8 @@ ng_gif_attach(struct ifnet *ifp) } /* Allocate private data */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) { log(LOG_ERR, "%s: can't %s for %s\n", __func__, "allocate memory", ifp->if_xname); @@ -503,7 +504,7 @@ ng_gif_shutdown(node_p node) * Assume the ifp has already been freed. */ NG_NODE_SET_PRIVATE(node, NULL); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); NG_NODE_UNREF(node); /* free node itself */ return (0); } diff --git a/sys/netgraph7/ng_gif_demux.c b/sys/netgraph7/ng_gif_demux.c index 1acc3a4c4f..2541223b96 100644 --- a/sys/netgraph7/ng_gif_demux.c +++ b/sys/netgraph7/ng_gif_demux.c @@ -232,8 +232,8 @@ ng_gif_demux_constructor(node_p node) priv_p priv; /* Allocate and initialize private info */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_GIF_DEMUX, - M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH_GIF_DEMUX, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); priv->node = node; @@ -370,7 +370,7 @@ ng_gif_demux_shutdown(node_p node) { const priv_p priv = NG_NODE_PRIVATE(node); - FREE(priv, M_NETGRAPH_GIF_DEMUX); + kfree(priv, M_NETGRAPH_GIF_DEMUX); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); return (0); diff --git a/sys/netgraph7/ng_hole.c b/sys/netgraph7/ng_hole.c index 3cdfe1bb61..9e1a84fab2 100644 --- a/sys/netgraph7/ng_hole.c +++ b/sys/netgraph7/ng_hole.c @@ -133,7 +133,7 @@ ngh_newhook(node_p node, hook_p hook, const char *name) hinfo_p hip; /* Create hook private structure. */ - MALLOC(hip, hinfo_p, sizeof(*hip), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + hip = kmalloc(sizeof(*hip), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); if (hip == NULL) return (ENOMEM); NG_HOOK_SET_PRIVATE(hook, hip); @@ -220,7 +220,7 @@ static int ngh_disconnect(hook_p hook) { - FREE(NG_HOOK_PRIVATE(hook), M_NETGRAPH); + kfree(NG_HOOK_PRIVATE(hook), M_NETGRAPH); NG_HOOK_SET_PRIVATE(hook, NULL); if (NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0) ng_rmnode_self(NG_HOOK_NODE(hook)); diff --git a/sys/netgraph7/ng_iface.c b/sys/netgraph7/ng_iface.c index c43e7f9bbc..f0a41b6ad6 100644 --- a/sys/netgraph7/ng_iface.c +++ b/sys/netgraph7/ng_iface.c @@ -507,12 +507,13 @@ ng_iface_constructor(node_p node) priv_p priv; /* Allocate node and interface private structures */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_IFACE, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH_IFACE, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); ifp = if_alloc(IFT_PROPVIRTUAL); if (ifp == NULL) { - FREE(priv, M_NETGRAPH_IFACE); + kfree(priv, M_NETGRAPH_IFACE); return (ENOMEM); } @@ -765,7 +766,7 @@ ng_iface_shutdown(node_p node) if_free(priv->ifp); priv->ifp = NULL; free_unr(ng_iface_unit, priv->unit); - FREE(priv, M_NETGRAPH_IFACE); + kfree(priv, M_NETGRAPH_IFACE); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); return (0); diff --git a/sys/netgraph7/ng_ipfw.c b/sys/netgraph7/ng_ipfw.c index 0c94d4fa72..4f2a6d2f73 100644 --- a/sys/netgraph7/ng_ipfw.c +++ b/sys/netgraph7/ng_ipfw.c @@ -163,7 +163,8 @@ ng_ipfw_newhook(node_p node, hook_p hook, const char *name) return (EINVAL); /* Allocate memory for this hook's private data */ - MALLOC(hpriv, hpriv_p, sizeof(*hpriv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + hpriv = kmalloc(sizeof(*hpriv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (hpriv== NULL) return (ENOMEM); @@ -332,7 +333,7 @@ ng_ipfw_disconnect(hook_p hook) { const hpriv_p hpriv = NG_HOOK_PRIVATE(hook); - FREE(hpriv, M_NETGRAPH); + kfree(hpriv, M_NETGRAPH); NG_HOOK_SET_PRIVATE(hook, NULL); return (0); diff --git a/sys/netgraph7/ng_ksocket.c b/sys/netgraph7/ng_ksocket.c index ff6894ba6e..eddcad32b9 100644 --- a/sys/netgraph7/ng_ksocket.c +++ b/sys/netgraph7/ng_ksocket.c @@ -246,17 +246,17 @@ ng_ksocket_sockaddr_parse(const struct ng_parse_type *type, return (EINVAL); pathlen = strlen(path); if (pathlen > SOCK_MAXADDRLEN) { - FREE(path, M_NETGRAPH_KSOCKET); + kfree(path, M_NETGRAPH_KSOCKET); return (E2BIG); } if (*buflen < pathoff + pathlen) { - FREE(path, M_NETGRAPH_KSOCKET); + kfree(path, M_NETGRAPH_KSOCKET); return (ERANGE); } *off += toklen; bcopy(path, sun->sun_path, pathlen); sun->sun_len = pathoff + pathlen; - FREE(path, M_NETGRAPH_KSOCKET); + kfree(path, M_NETGRAPH_KSOCKET); break; } @@ -330,7 +330,7 @@ ng_ksocket_sockaddr_unparse(const struct ng_parse_type *type, if ((pathtoken = ng_encode_string(pathbuf, pathlen)) == NULL) return (ENOMEM); slen += snprintf(cbuf, cbuflen, "local/%s", pathtoken); - FREE(pathtoken, M_NETGRAPH_KSOCKET); + kfree(pathtoken, M_NETGRAPH); if (slen >= cbuflen) return (ERANGE); *off += sun->sun_len; @@ -517,8 +517,8 @@ ng_ksocket_constructor(node_p node) priv_p priv; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), - M_NETGRAPH_KSOCKET, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -805,7 +805,7 @@ ng_ksocket_rcvmsg(node_p node, item_p item, hook_p lasthook) bail: /* Cleanup */ if (sa != NULL) - FREE(sa, M_SONAME); + kfree(sa, M_SONAME); break; } @@ -959,7 +959,7 @@ ng_ksocket_shutdown(node_p node) /* Take down netgraph node */ bzero(priv, sizeof(*priv)); - FREE(priv, M_NETGRAPH_KSOCKET); + kfree(priv, M_NETGRAPH); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); /* let the node escape */ return (0); @@ -1099,7 +1099,7 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2) /* See if we got anything */ if (m == NULL) { if (sa != NULL) - FREE(sa, M_SONAME); + kfree(sa, M_SONAME); break; } @@ -1124,11 +1124,11 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2) NG_KSOCKET_TAG_SOCKADDR, sizeof(ng_ID_t) + sa->sa_len, MB_DONTWAIT); if (stag == NULL) { - FREE(sa, M_SONAME); + kfree(sa, M_SONAME); goto sendit; } bcopy(sa, &stag->sa, sa->sa_len); - FREE(sa, M_SONAME); + kfree(sa, M_SONAME); stag->id = NG_NODE_ID(node); m_tag_prepend(m, &stag->tag); } @@ -1228,14 +1228,14 @@ ng_ksocket_finish_accept(priv_p priv) /* Clone a ksocket node to wrap the new socket */ error = ng_make_node_common(&ng_ksocket_typestruct, &node); if (error) { - FREE(resp, M_NETGRAPH); + kfree(resp, M_NETGRAPH); soclose(so); goto out; } if (ng_ksocket_constructor(node) != 0) { NG_NODE_UNREF(node); - FREE(resp, M_NETGRAPH); + kfree(resp, M_NETGRAPH); soclose(so); goto out; } @@ -1270,7 +1270,7 @@ ng_ksocket_finish_accept(priv_p priv) out: if (sa != NULL) - FREE(sa, M_SONAME); + kfree(sa, M_SONAME); } /* diff --git a/sys/netgraph7/ng_l2tp.c b/sys/netgraph7/ng_l2tp.c index 1458e5c672..58d05d2992 100644 --- a/sys/netgraph7/ng_l2tp.c +++ b/sys/netgraph7/ng_l2tp.c @@ -365,7 +365,8 @@ ng_l2tp_constructor(node_p node) int i; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_L2TP, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH_L2TP, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); NG_NODE_SET_PRIVATE(node, priv); @@ -429,8 +430,8 @@ ng_l2tp_newhook(node_p node, hook_p hook, const char *name) return (EINVAL); /* Create hook private structure */ - MALLOC(hpriv, hookpriv_p, - sizeof(*hpriv), M_NETGRAPH_L2TP, M_WAITOK | M_NULLOK | M_ZERO); + hpriv = kmalloc(sizeof(*hpriv), M_NETGRAPH_L2TP, + M_WAITOK | M_NULLOK | M_ZERO); if (hpriv == NULL) return (ENOMEM); hpriv->conf.session_id = htons(session_id); @@ -684,7 +685,7 @@ ng_l2tp_shutdown(node_p node) mtx_destroy(&seq->mtx); - FREE(priv, M_NETGRAPH_L2TP); + kfree(priv, M_NETGRAPH_L2TP); /* Unref node */ NG_NODE_UNREF(node); @@ -708,7 +709,7 @@ ng_l2tp_disconnect(hook_p hook) else { const hookpriv_p hpriv = NG_HOOK_PRIVATE(hook); LIST_REMOVE(hpriv, sessions); - FREE(hpriv, M_NETGRAPH_L2TP); + kfree(hpriv, M_NETGRAPH_L2TP); NG_HOOK_SET_PRIVATE(hook, NULL); } diff --git a/sys/netgraph7/ng_lmi.c b/sys/netgraph7/ng_lmi.c index 40e434c2da..91596a3719 100644 --- a/sys/netgraph7/ng_lmi.c +++ b/sys/netgraph7/ng_lmi.c @@ -186,7 +186,7 @@ nglmi_constructor(node_p node) { sc_p sc; - MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + sc = kmalloc(sizeof(*sc), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); if (sc == NULL) return (ENOMEM); @@ -1054,7 +1054,7 @@ nglmi_shutdown(node_p node) NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(sc->node); - FREE(sc, M_NETGRAPH); + kfree(sc, M_NETGRAPH); return (0); } diff --git a/sys/netgraph7/ng_message.h b/sys/netgraph7/ng_message.h index c8fadba887..8b0342ed57 100644 --- a/sys/netgraph7/ng_message.h +++ b/sys/netgraph7/ng_message.h @@ -389,8 +389,8 @@ struct flow_manager { */ #define NG_MKMESSAGE(msg, cookie, cmdid, len, how) \ do { \ - MALLOC((msg), struct ng_mesg *, sizeof(struct ng_mesg) \ - + (len), M_NETGRAPH_MSG, (how) | M_ZERO); \ + (msg) = kmalloc(sizeof(struct ng_mesg) + (len), \ + M_NETGRAPH_MSG, (how) | M_ZERO); \ if ((msg) == NULL) \ break; \ (msg)->header.version = NG_VERSION; \ @@ -407,8 +407,8 @@ struct flow_manager { */ #define NG_MKRESPONSE(rsp, msg, len, how) \ do { \ - MALLOC((rsp), struct ng_mesg *, sizeof(struct ng_mesg) \ - + (len), M_NETGRAPH_MSG, (how) | M_ZERO); \ + (rsp) = kmalloc(sizeof(struct ng_mesg) + (len), \ + M_NETGRAPH_MSG, (how) | M_ZERO); \ if ((rsp) == NULL) \ break; \ (rsp)->header.version = NG_VERSION; \ @@ -426,8 +426,8 @@ struct flow_manager { */ #define NG_COPYMESSAGE(copy, msg, how) \ do { \ - MALLOC((copy), struct ng_mesg *, sizeof(struct ng_mesg) + \ - (msg)->header.arglen, M_NETGRAPH_MSG, (how) | M_ZERO); \ + (copy) = kmalloc(sizeof(struct ng_mesg) + (msg)->header.arglen,\ + M_NETGRAPH_MSG, (how) | M_ZERO); \ if ((copy) == NULL) \ break; \ (copy)->header.version = NG_VERSION; \ diff --git a/sys/netgraph7/ng_mppc.c b/sys/netgraph7/ng_mppc.c index 087d320f4e..d4db899af8 100644 --- a/sys/netgraph7/ng_mppc.c +++ b/sys/netgraph7/ng_mppc.c @@ -201,7 +201,8 @@ ng_mppc_constructor(node_p node) priv_p priv; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_MPPC, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH_MPPC, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -292,14 +293,13 @@ ng_mppc_rcvmsg(node_p node, item_p item, hook_p lasthook) #ifdef NETGRAPH7_MPPC_COMPRESSION /* Initialize state buffers for compression */ if (d->history != NULL) { - FREE(d->history, M_NETGRAPH_MPPC); + kfree(d->history, M_NETGRAPH_MPPC); d->history = NULL; } if ((cfg->bits & MPPC_BIT) != 0) { - MALLOC(d->history, u_char *, - isComp ? MPPC_SizeOfCompressionHistory() : - MPPC_SizeOfDecompressionHistory(), - M_NETGRAPH_MPPC, M_WAITOK | M_NULLOK); + d->history = kmalloc(isComp ? MPPC_SizeOfCompressionHistory() : MPPC_SizeOfDecompressionHistory(), + M_NETGRAPH_MPPC, + M_WAITOK | M_NULLOK); if (d->history == NULL) ERROUT(ENOMEM); if (isComp) @@ -422,12 +422,12 @@ ng_mppc_shutdown(node_p node) /* Take down netgraph node */ #ifdef NETGRAPH7_MPPC_COMPRESSION if (priv->xmit.history != NULL) - FREE(priv->xmit.history, M_NETGRAPH_MPPC); + kfree(priv->xmit.history, M_NETGRAPH_MPPC); if (priv->recv.history != NULL) - FREE(priv->recv.history, M_NETGRAPH_MPPC); + kfree(priv->recv.history, M_NETGRAPH_MPPC); #endif bzero(priv, sizeof(*priv)); - FREE(priv, M_NETGRAPH_MPPC); + kfree(priv, M_NETGRAPH_MPPC); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); /* let the node escape */ return (0); diff --git a/sys/netgraph7/ng_nat.c b/sys/netgraph7/ng_nat.c index 78c626b783..64856d5eab 100644 --- a/sys/netgraph7/ng_nat.c +++ b/sys/netgraph7/ng_nat.c @@ -273,15 +273,15 @@ ng_nat_constructor(node_p node) priv_p priv; /* Initialize private descriptor. */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, - M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); /* Init aliasing engine. */ priv->lib = LibAliasInit(NULL); if (priv->lib == NULL) { - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); return (ENOMEM); } @@ -409,7 +409,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) if (entry->lnk == NULL) { error = ENOMEM; - FREE(entry, M_NETGRAPH); + kfree(entry, M_NETGRAPH); break; } @@ -465,7 +465,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) if (entry->lnk == NULL) { error = ENOMEM; - FREE(entry, M_NETGRAPH); + kfree(entry, M_NETGRAPH); break; } @@ -518,7 +518,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) if (entry->lnk == NULL) { error = ENOMEM; - FREE(entry, M_NETGRAPH); + kfree(entry, M_NETGRAPH); break; } @@ -584,7 +584,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) /* Delete entry from our internal list. */ priv->rdrcount--; STAILQ_REMOVE(&priv->redirhead, entry, ng_nat_rdr_lst, entries); - FREE(entry, M_NETGRAPH); + kfree(entry, M_NETGRAPH); } break; case NGM_NAT_ADD_SERVER: @@ -786,12 +786,12 @@ ng_nat_shutdown(node_p node) while (!STAILQ_EMPTY(&priv->redirhead)) { struct ng_nat_rdr_lst *entry = STAILQ_FIRST(&priv->redirhead); STAILQ_REMOVE_HEAD(&priv->redirhead, entries); - FREE(entry, M_NETGRAPH); + kfree(entry, M_NETGRAPH); }; /* Final free. */ LibAliasUninit(priv->lib); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); return (0); } diff --git a/sys/netgraph7/ng_one2many.c b/sys/netgraph7/ng_one2many.c index f4923e65a1..7b692b1e6d 100644 --- a/sys/netgraph7/ng_one2many.c +++ b/sys/netgraph7/ng_one2many.c @@ -188,7 +188,8 @@ ng_one2many_constructor(node_p node) priv_p priv; /* Allocate and initialize private info */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); priv->conf.xmitAlg = NG_ONE2MANY_XMIT_ROUNDROBIN; @@ -502,7 +503,7 @@ ng_one2many_shutdown(node_p node) KASSERT(priv->numActiveMany == 0, ("%s: numActiveMany=%d", __func__, priv->numActiveMany)); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); return (0); diff --git a/sys/netgraph7/ng_parse.c b/sys/netgraph7/ng_parse.c index 2e6e1ae49e..507c48f613 100644 --- a/sys/netgraph7/ng_parse.c +++ b/sys/netgraph7/ng_parse.c @@ -741,7 +741,7 @@ ng_string_parse(const struct ng_parse_type *type, return (EINVAL); *off += len; bcopy(sval, buf, slen + 1); - FREE(sval, M_NETGRAPH_PARSE); + kfree(sval, M_NETGRAPH_PARSE); *buflen = slen + 1; return (0); } @@ -757,11 +757,11 @@ ng_string_unparse(const struct ng_parse_type *type, if (s == NULL) return (ENOMEM); if ((error = ng_parse_append(&cbuf, &cbuflen, "%s", s)) != 0) { - FREE(s, M_NETGRAPH_PARSE); + kfree(s, M_NETGRAPH_PARSE); return (error); } *off += strlen(raw) + 1; - FREE(s, M_NETGRAPH_PARSE); + kfree(s, M_NETGRAPH_PARSE); return (0); } @@ -804,12 +804,12 @@ ng_fixedstring_parse(const struct ng_parse_type *type, if ((sval = ng_get_string_token(s, off, &len, &slen)) == NULL) return (EINVAL); if (slen + 1 > fi->bufSize) { - FREE(sval, M_NETGRAPH_PARSE); + kfree(sval, M_NETGRAPH_PARSE); return (E2BIG); } *off += len; bcopy(sval, buf, slen); - FREE(sval, M_NETGRAPH_PARSE); + kfree(sval, M_NETGRAPH_PARSE); bzero(buf + slen, fi->bufSize - slen); *buflen = fi->bufSize; return (0); @@ -907,13 +907,13 @@ ng_sizedstring_parse(const struct ng_parse_type *type, if ((sval = ng_get_string_token(s, off, &len, &slen)) == NULL) return (EINVAL); if (slen > USHRT_MAX) { - FREE(sval, M_NETGRAPH_PARSE); + kfree(sval, M_NETGRAPH_PARSE); return (EINVAL); } *off += len; *((u_int16_t *)buf) = (u_int16_t)slen; bcopy(sval, buf + 2, slen); - FREE(sval, M_NETGRAPH_PARSE); + kfree(sval, M_NETGRAPH_PARSE); *buflen = 2 + slen; return (0); } @@ -930,10 +930,10 @@ ng_sizedstring_unparse(const struct ng_parse_type *type, if (s == NULL) return (ENOMEM); if ((error = ng_parse_append(&cbuf, &cbuflen, "%s", s)) != 0) { - FREE(s, M_NETGRAPH_PARSE); + kfree(s, M_NETGRAPH_PARSE); return (error); } - FREE(s, M_NETGRAPH_PARSE); + kfree(s, M_NETGRAPH_PARSE); *off += slen + 2; return (0); } @@ -1118,16 +1118,16 @@ ng_bytearray_parse(const struct ng_parse_type *type, arraylen = (*getLength)(type, start, buf); if (arraylen > *buflen) { - FREE(str, M_NETGRAPH_PARSE); + kfree(str, M_NETGRAPH_PARSE); return (ERANGE); } if (slen > arraylen) { - FREE(str, M_NETGRAPH_PARSE); + kfree(str, M_NETGRAPH_PARSE); return (E2BIG); } bcopy(str, buf, slen); bzero(buf + slen, arraylen - slen); - FREE(str, M_NETGRAPH_PARSE); + kfree(str, M_NETGRAPH_PARSE); *off += toklen; *buflen = arraylen; return (0); @@ -1220,7 +1220,8 @@ ng_parse_composite(const struct ng_parse_type *type, const char *s, int align, len, blen, error = 0; /* Initialize */ - MALLOC(foff, int *, num * sizeof(*foff), M_NETGRAPH_PARSE, M_WAITOK | M_NULLOK | M_ZERO); + foff = kmalloc(num * sizeof(*foff), M_NETGRAPH_PARSE, + M_WAITOK | M_NULLOK | M_ZERO); if (foff == NULL) { error = ENOMEM; goto done; @@ -1376,7 +1377,7 @@ gotIndex: *buflen = blen; done: if (foff != NULL) - FREE(foff, M_NETGRAPH_PARSE); + kfree(foff, M_NETGRAPH_PARSE); return (error); } @@ -1396,7 +1397,7 @@ ng_unparse_composite(const struct ng_parse_type *type, const u_char *data, u_char *workBuf; /* Get workspace for checking default values */ - MALLOC(workBuf, u_char *, workSize, M_NETGRAPH_PARSE, M_WAITOK | M_NULLOK); + workBuf = kmalloc(workSize, M_NETGRAPH_PARSE, M_WAITOK | M_NULLOK); if (workBuf == NULL) return (ENOMEM); @@ -1454,7 +1455,7 @@ ng_unparse_composite(const struct ng_parse_type *type, const u_char *data, /* Print value */ if ((error = INVOKE(etype, unparse) (etype, data, off, cbuf, cbuflen)) != 0) { - FREE(workBuf, M_NETGRAPH_PARSE); + kfree(workBuf, M_NETGRAPH_PARSE); return (error); } cbuflen -= strlen(cbuf); @@ -1468,7 +1469,7 @@ ng_unparse_composite(const struct ng_parse_type *type, const u_char *data, fail: /* Clean up after failure */ - FREE(workBuf, M_NETGRAPH_PARSE); + kfree(workBuf, M_NETGRAPH_PARSE); return (error); } @@ -1718,7 +1719,7 @@ ng_parse_get_token(const char *s, int *startp, int *lenp) case '"': if ((t = ng_get_string_token(s, startp, lenp, NULL)) == NULL) return T_ERROR; - FREE(t, M_NETGRAPH_PARSE); + kfree(t, M_NETGRAPH_PARSE); return T_STRING; default: for (i = *startp + 1; s[i] != '\0' && !isspace(s[i]) @@ -1746,7 +1747,8 @@ ng_get_string_token(const char *s, int *startp, int *lenp, int *slenp) start = *startp; if (s[*startp] != '"') return (NULL); - MALLOC(cbuf, char *, strlen(s + start), M_NETGRAPH_PARSE, M_WAITOK | M_NULLOK); + cbuf = kmalloc(strlen(s + start), M_NETGRAPH_PARSE, + M_WAITOK | M_NULLOK); if (cbuf == NULL) return (NULL); strcpy(cbuf, s + start + 1); @@ -1813,7 +1815,7 @@ ng_get_string_token(const char *s, int *startp, int *lenp, int *slenp) strcpy(p, v); } } - FREE(cbuf, M_NETGRAPH_PARSE); + kfree(cbuf, M_NETGRAPH_PARSE); return (NULL); /* no closing quote */ } @@ -1829,7 +1831,8 @@ ng_encode_string(const char *raw, int slen) int off = 0; int i; - MALLOC(cbuf, char *, strlen(raw) * 4 + 3, M_NETGRAPH_PARSE, M_WAITOK | M_NULLOK); + cbuf = kmalloc(strlen(raw) * 4 + 3, M_NETGRAPH_PARSE, + M_WAITOK | M_NULLOK); if (cbuf == NULL) return (NULL); cbuf[off++] = '"'; diff --git a/sys/netgraph7/ng_ppp.c b/sys/netgraph7/ng_ppp.c index 1418f9b0af..ffb40343d9 100644 --- a/sys/netgraph7/ng_ppp.c +++ b/sys/netgraph7/ng_ppp.c @@ -491,7 +491,8 @@ ng_ppp_constructor(node_p node) int i; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_PPP, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH_PPP, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -744,7 +745,7 @@ ng_ppp_shutdown(node_p node) mtx_destroy(&priv->rmtx); mtx_destroy(&priv->xmtx); bzero(priv, sizeof(*priv)); - FREE(priv, M_NETGRAPH_PPP); + kfree(priv, M_NETGRAPH_PPP); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); /* let the node escape */ return (0); diff --git a/sys/netgraph7/ng_pptpgre.c b/sys/netgraph7/ng_pptpgre.c index 39758ac633..951562c947 100644 --- a/sys/netgraph7/ng_pptpgre.c +++ b/sys/netgraph7/ng_pptpgre.c @@ -281,7 +281,8 @@ ng_pptpgre_constructor(node_p node) int i; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -520,7 +521,7 @@ ng_pptpgre_shutdown(node_p node) LIST_REMOVE(&priv->uppersess, sessions); mtx_destroy(&priv->uppersess.mtx); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); /* Decrement ref count */ NG_NODE_UNREF(node); diff --git a/sys/netgraph7/ng_rfc1490.c b/sys/netgraph7/ng_rfc1490.c index e954806ba7..6c3e1d1584 100644 --- a/sys/netgraph7/ng_rfc1490.c +++ b/sys/netgraph7/ng_rfc1490.c @@ -166,7 +166,8 @@ ng_rfc1490_constructor(node_p node) priv_p priv; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -460,7 +461,7 @@ ng_rfc1490_shutdown(node_p node) /* Take down netgraph node */ bzero(priv, sizeof(*priv)); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); /* let the node escape */ return (0); diff --git a/sys/netgraph7/ng_sample.c b/sys/netgraph7/ng_sample.c index 6a9a46ee0b..8beb302e7c 100644 --- a/sys/netgraph7/ng_sample.c +++ b/sys/netgraph7/ng_sample.c @@ -155,8 +155,8 @@ ng_xxx_constructor(node_p node) int i; /* Initialize private descriptor */ - MALLOC(privdata, xxx_p, sizeof(*privdata), M_NETGRAPH, - M_WAITOK | M_NULLOK | M_ZERO); + privdata = kmalloc(sizeof(*privdata), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (privdata == NULL) return (ENOMEM); for (i = 0; i < XXX_NUM_DLCIS; i++) { @@ -425,7 +425,7 @@ ng_xxx_shutdown(node_p node) #ifndef PERSISTANT_NODE NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); - FREE(privdata, M_NETGRAPH); + kfree(privdata, M_NETGRAPH); #else if (node->nd_flags & NGF_REALLY_DIE) { /* @@ -435,7 +435,7 @@ ng_xxx_shutdown(node_p node) */ NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(privdata->node); - FREE(privdata, M_NETGRAPH); + kfree(privdata, M_NETGRAPH); return (0); } NG_NODE_REVIVE(node); /* tell ng_rmnode() we will persist */ diff --git a/sys/netgraph7/ng_split.c b/sys/netgraph7/ng_split.c index c02f727355..dfe05f2600 100644 --- a/sys/netgraph7/ng_split.c +++ b/sys/netgraph7/ng_split.c @@ -86,7 +86,8 @@ ng_split_constructor(node_p node) priv_p priv; /* Allocate node */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_ZERO | M_WAITOK | M_NULLOK); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_ZERO | M_WAITOK | M_NULLOK); if (priv == NULL) return (ENOMEM); @@ -156,7 +157,7 @@ ng_split_shutdown(node_p node) NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); return (0); } diff --git a/sys/netgraph7/ng_sppp.c b/sys/netgraph7/ng_sppp.c index 35bb7141c4..f2c2464d70 100644 --- a/sys/netgraph7/ng_sppp.c +++ b/sys/netgraph7/ng_sppp.c @@ -122,8 +122,8 @@ ng_sppp_get_unit (int *unit) int newlen; newlen = (2 * ng_sppp_units_len) + sizeof (*ng_sppp_units); - MALLOC (newarray, unsigned char *, - newlen * sizeof (*ng_sppp_units), M_NETGRAPH_SPPP, M_WAITOK | M_NULLOK); + newarray = kmalloc(newlen * sizeof(*ng_sppp_units), + M_NETGRAPH_SPPP, M_WAITOK | M_NULLOK); if (newarray == NULL) return (ENOMEM); bcopy (ng_sppp_units, newarray, @@ -131,7 +131,7 @@ ng_sppp_get_unit (int *unit) bzero (newarray + ng_sppp_units_len, newlen - ng_sppp_units_len); if (ng_sppp_units != NULL) - FREE (ng_sppp_units, M_NETGRAPH_SPPP); + kfree(ng_sppp_units, M_NETGRAPH_SPPP); ng_sppp_units = newarray; ng_sppp_units_len = newlen; } @@ -164,7 +164,7 @@ ng_sppp_free_unit (int unit) ng_units_in_use--; if (ng_units_in_use == 0) { - FREE (ng_sppp_units, M_NETGRAPH_SPPP); + kfree(ng_sppp_units, M_NETGRAPH_SPPP); ng_sppp_units_len = 0; ng_sppp_units = NULL; } @@ -249,13 +249,14 @@ ng_sppp_constructor (node_p node) int error = 0; /* Allocate node and interface private structures */ - MALLOC (priv, priv_p, sizeof(*priv), M_NETGRAPH_SPPP, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH_SPPP, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); ifp = if_alloc(IFT_PPP); if (ifp == NULL) { - FREE (priv, M_NETGRAPH_SPPP); + kfree(priv, M_NETGRAPH_SPPP); return (ENOSPC); } pp = IFP2SP(ifp); @@ -266,8 +267,8 @@ ng_sppp_constructor (node_p node) /* Get an interface unit number */ if ((error = ng_sppp_get_unit(&priv->unit)) != 0) { - FREE (pp, M_NETGRAPH_SPPP); - FREE (priv, M_NETGRAPH_SPPP); + kfree(pp, M_NETGRAPH_SPPP); + kfree(priv, M_NETGRAPH_SPPP); return (error); } @@ -402,7 +403,7 @@ ng_sppp_shutdown (node_p node) if_detach (priv->ifp); if_free(priv->ifp); ng_sppp_free_unit (priv->unit); - FREE (priv, M_NETGRAPH_SPPP); + kfree(priv, M_NETGRAPH_SPPP); NG_NODE_SET_PRIVATE (node, NULL); NG_NODE_UNREF (node); return (0); diff --git a/sys/netgraph7/ng_tag.c b/sys/netgraph7/ng_tag.c index ecff17c6dd..3413e76792 100644 --- a/sys/netgraph7/ng_tag.c +++ b/sys/netgraph7/ng_tag.c @@ -304,7 +304,7 @@ ng_tag_newhook(node_p node, hook_p hook, const char *name) int error; /* Create hook private structure. */ - MALLOC(hip, hinfo_p, sizeof(*hip), M_NETGRAPH_TAG, M_WAITOK | M_ZERO); + hip = kmalloc(sizeof(*hip), M_NETGRAPH_TAG, M_WAITOK | M_ZERO); /* M_WAITOK can't return NULL. */ NG_HOOK_SET_PRIVATE(hook, hip); @@ -317,13 +317,13 @@ ng_tag_newhook(node_p node, hook_p hook, const char *name) /* Attach the default IN data. */ if ((error = ng_tag_setdata_in(hook, &ng_tag_default_in)) != 0) { - FREE(hip, M_NETGRAPH_TAG); + kfree(hip, M_NETGRAPH_TAG); return (error); } /* Attach the default OUT data. */ if ((error = ng_tag_setdata_out(hook, &ng_tag_default_out)) != 0) { - FREE(hip, M_NETGRAPH_TAG); + kfree(hip, M_NETGRAPH_TAG); return (error); } @@ -622,9 +622,9 @@ ng_tag_disconnect(hook_p hook) priv->hi_nonmatch = NULL; } - FREE(hip->in, M_NETGRAPH_TAG); - FREE(hip->out, M_NETGRAPH_TAG); - FREE(hip, M_NETGRAPH_TAG); + kfree(hip->in, M_NETGRAPH_TAG); + kfree(hip->out, M_NETGRAPH_TAG); + kfree(hip, M_NETGRAPH_TAG); NG_HOOK_SET_PRIVATE(hook, NULL); /* for good measure */ if ((NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0) && (NG_NODE_IS_VALID(NG_HOOK_NODE(hook)))) { @@ -649,13 +649,13 @@ ng_tag_setdata_in(hook_p hook, const struct ng_tag_hookin *hp0) /* Make a copy of the tag values and data. */ size = NG_TAG_HOOKIN_SIZE(hp0->tag_len); - MALLOC(hp, struct ng_tag_hookin *, size, M_NETGRAPH_TAG, M_WAITOK); + hp = kmalloc(size, M_NETGRAPH_TAG, M_WAITOK); /* M_WAITOK can't return NULL. */ bcopy(hp0, hp, size); /* Free previous tag, if any, and assign new one. */ if (hip->in != NULL) - FREE(hip->in, M_NETGRAPH_TAG); + kfree(hip->in, M_NETGRAPH_TAG); hip->in = hp; /* @@ -699,13 +699,13 @@ ng_tag_setdata_out(hook_p hook, const struct ng_tag_hookout *hp0) /* Make a copy of the tag values and data. */ size = NG_TAG_HOOKOUT_SIZE(hp0->tag_len); - MALLOC(hp, struct ng_tag_hookout *, size, M_NETGRAPH_TAG, M_WAITOK); + hp = kmalloc(size, M_NETGRAPH_TAG, M_WAITOK); /* M_WAITOK can't return NULL. */ bcopy(hp0, hp, size); /* Free previous tag, if any, and assign new one. */ if (hip->out != NULL) - FREE(hip->out, M_NETGRAPH_TAG); + kfree(hip->out, M_NETGRAPH_TAG); hip->out = hp; /* Fill internal values from API structures. */ diff --git a/sys/netgraph7/ng_tcpmss.c b/sys/netgraph7/ng_tcpmss.c index fa098d025b..6b510aa94c 100644 --- a/sys/netgraph7/ng_tcpmss.c +++ b/sys/netgraph7/ng_tcpmss.c @@ -160,7 +160,8 @@ ng_tcpmss_newhook(node_p node, hook_p hook, const char *name) { hpriv_p priv; - MALLOC(priv, hpriv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -372,7 +373,7 @@ ng_tcpmss_disconnect(hook_p hook) priv->outHook = NULL; } - FREE(NG_HOOK_PRIVATE(hook), M_NETGRAPH); + kfree(NG_HOOK_PRIVATE(hook), M_NETGRAPH); if (NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0) ng_rmnode_self(NG_HOOK_NODE(hook)); diff --git a/sys/netgraph7/ng_tee.c b/sys/netgraph7/ng_tee.c index d2995d2371..45d91acd9b 100644 --- a/sys/netgraph7/ng_tee.c +++ b/sys/netgraph7/ng_tee.c @@ -154,7 +154,8 @@ ng_tee_constructor(node_p node) { sc_p privdata; - MALLOC(privdata, sc_p, sizeof(*privdata), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + privdata = kmalloc(sizeof(*privdata), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (privdata == NULL) return (ENOMEM); @@ -357,7 +358,7 @@ ng_tee_shutdown(node_p node) const sc_p privdata = NG_NODE_PRIVATE(node); NG_NODE_SET_PRIVATE(node, NULL); - FREE(privdata, M_NETGRAPH); + kfree(privdata, M_NETGRAPH); NG_NODE_UNREF(node); return (0); } diff --git a/sys/netgraph7/ng_tty.c b/sys/netgraph7/ng_tty.c index b478705397..fc4beebb63 100644 --- a/sys/netgraph7/ng_tty.c +++ b/sys/netgraph7/ng_tty.c @@ -195,7 +195,7 @@ ngt_open(struct cdev *dev, struct tty *tp) return (error); /* Initialize private struct */ - MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_WAITOK | M_ZERO); + sc = kmalloc(sizeof(*sc), M_NETGRAPH, M_WAITOK | M_ZERO); if (sc == NULL) return (ENOMEM); @@ -211,7 +211,7 @@ ngt_open(struct cdev *dev, struct tty *tp) error = ng_make_node_common(&typestruct, &sc->node); if (error) { NGTUNLOCK(sc); - FREE(sc, M_NETGRAPH); + kfree(sc, M_NETGRAPH); lwkt_reltoken(&tty_token); return (error); } @@ -587,7 +587,7 @@ ngt_shutdown(node_p node) mtx_destroy(&(sc)->outq.ifq_mtx); m_freem(sc->m); NG_NODE_UNREF(sc->node); - FREE(sc, M_NETGRAPH); + kfree(sc, M_NETGRAPH); return (0); } diff --git a/sys/netgraph7/ng_vjc.c b/sys/netgraph7/ng_vjc.c index 2cfc867324..9634387bc6 100644 --- a/sys/netgraph7/ng_vjc.c +++ b/sys/netgraph7/ng_vjc.c @@ -244,7 +244,8 @@ ng_vjc_constructor(node_p node) priv_p priv; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -546,7 +547,7 @@ ng_vjc_shutdown(node_p node) const priv_p priv = NG_NODE_PRIVATE(node); bzero(priv, sizeof(*priv)); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); return (0); diff --git a/sys/netgraph7/ng_vlan.c b/sys/netgraph7/ng_vlan.c index 30e00da8c9..0b064b2f0c 100644 --- a/sys/netgraph7/ng_vlan.c +++ b/sys/netgraph7/ng_vlan.c @@ -162,7 +162,8 @@ ng_vlan_constructor(node_p node) priv_p priv; int i; - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + priv = kmalloc(sizeof(*priv), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (priv == NULL) return (ENOMEM); for (i = 0; i < HASHSIZE; i++) @@ -242,8 +243,8 @@ ng_vlan_rcvmsg(node_p node, item_p item, hook_p lasthook) break; } /* Create filter. */ - MALLOC(f, struct filter *, sizeof(*f), - M_NETGRAPH, M_WAITOK | M_NULLOK | M_ZERO); + f = kmalloc(sizeof(*f), M_NETGRAPH, + M_WAITOK | M_NULLOK | M_ZERO); if (f == NULL) { error = ENOMEM; break; @@ -274,7 +275,7 @@ ng_vlan_rcvmsg(node_p node, item_p item, hook_p lasthook) NG_HOOK_SET_PRIVATE(hook, NULL); LIST_REMOVE(f, next); priv->nent--; - FREE(f, M_NETGRAPH); + kfree(f, M_NETGRAPH); break; case NGM_VLAN_GET_TABLE: NG_MKRESPONSE(resp, msg, sizeof(*t) + @@ -439,7 +440,7 @@ ng_vlan_shutdown(node_p node) NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); - FREE(priv, M_NETGRAPH); + kfree(priv, M_NETGRAPH); return (0); } @@ -458,7 +459,7 @@ ng_vlan_disconnect(hook_p hook) if ((f = NG_HOOK_PRIVATE(hook)) != NULL) { LIST_REMOVE(f, next); priv->nent--; - FREE(f, M_NETGRAPH); + kfree(f, M_NETGRAPH); } } NG_HOOK_SET_PRIVATE(hook, NULL);