summaryrefslogtreecommitdiffstats
path: root/sys/netgraph
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netgraph')
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c2
-rw-r--r--sys/netgraph/netflow/netflow.c2
-rw-r--r--sys/netgraph/ng_async.c6
-rw-r--r--sys/netgraph/ng_bridge.c11
-rw-r--r--sys/netgraph/ng_fec.c2
-rw-r--r--sys/netgraph/ng_l2tp.c3
-rw-r--r--sys/netgraph/ng_mppc.c3
7 files changed, 18 insertions, 11 deletions
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index 2d2e006..ecfa36d 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -377,7 +377,7 @@ ng_btsocket_l2cap_raw_input(void *context, int pending)
rt = (ng_btsocket_l2cap_rtentry_t *)
NG_HOOK_PRIVATE(hook);
if (rt == NULL) {
- rt = malloc( sizeof(*rt),
+ rt = malloc(sizeof(*rt),
M_NETGRAPH_BTSOCKET_L2CAP_RAW,
M_NOWAIT|M_ZERO);
if (rt == NULL)
diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c
index bf261a9..5443629 100644
--- a/sys/netgraph/netflow/netflow.c
+++ b/sys/netgraph/netflow/netflow.c
@@ -331,7 +331,7 @@ ng_netflow_cache_init(priv_p priv)
uma_zone_set_max(priv->zone, CACHESIZE);
/* Allocate hash. */
- priv->hash = malloc( NBUCKETS * sizeof(struct flow_hash_entry),
+ priv->hash = malloc(NBUCKETS * sizeof(struct flow_hash_entry),
M_NETFLOW_HASH, M_WAITOK | M_ZERO);
if (priv->hash == NULL) {
diff --git a/sys/netgraph/ng_async.c b/sys/netgraph/ng_async.c
index 6841617..77c96df 100644
--- a/sys/netgraph/ng_async.c
+++ b/sys/netgraph/ng_async.c
@@ -190,10 +190,12 @@ nga_constructor(node_p node)
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);
+ sc->abuf = malloc(ASYNC_BUF_SIZE(sc->cfg.smru),
+ M_NETGRAPH_ASYNC, M_NOWAIT);
if (sc->abuf == NULL)
goto fail;
- sc->sbuf = malloc( SYNC_BUF_SIZE(sc->cfg.amru), M_NETGRAPH_ASYNC, M_NOWAIT);
+ 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:
diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c
index da48f23..c033a55 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -304,7 +304,8 @@ ng_bridge_constructor(node_p node)
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);
+ 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);
@@ -358,7 +359,8 @@ ng_bridge_newhook(node_p node, hook_p hook, const char *name)
return (EINVAL);
if (priv->links[linkNum] != NULL)
return (EISCONN);
- priv->links[linkNum] = malloc( sizeof(*priv->links[linkNum]), M_NETGRAPH_BRIDGE, M_NOWAIT|M_ZERO);
+ priv->links[linkNum] = malloc(sizeof(*priv->links[linkNum]),
+ M_NETGRAPH_BRIDGE, M_NOWAIT|M_ZERO);
if (priv->links[linkNum] == NULL)
return (ENOMEM);
priv->links[linkNum]->hook = hook;
@@ -848,7 +850,7 @@ ng_bridge_put(priv_p priv, const u_char *addr, int linkNum)
#endif
/* Allocate and initialize new hashtable entry */
- hent = malloc( sizeof(*hent), M_NETGRAPH_BRIDGE, M_NOWAIT);
+ hent = malloc(sizeof(*hent), M_NETGRAPH_BRIDGE, M_NOWAIT);
if (hent == NULL)
return (0);
bcopy(addr, hent->host.addr, ETHER_ADDR_LEN);
@@ -892,7 +894,8 @@ ng_bridge_rehash(priv_p priv)
newMask = newNumBuckets - 1;
/* Allocate and initialize new table */
- newTab = malloc( newNumBuckets * sizeof(*newTab), M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO);
+ newTab = malloc(newNumBuckets * sizeof(*newTab),
+ M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO);
if (newTab == NULL)
return;
diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c
index 83a3462..dc4ad40 100644
--- a/sys/netgraph/ng_fec.c
+++ b/sys/netgraph/ng_fec.c
@@ -403,7 +403,7 @@ ng_fec_addport(struct ng_fec_private *priv, char *iface)
}
/* Allocate new list entry. */
- new = malloc( sizeof(struct ng_fec_portlist), M_NETGRAPH, M_NOWAIT);
+ new = malloc(sizeof(struct ng_fec_portlist), M_NETGRAPH, M_NOWAIT);
if (new == NULL)
return(ENOMEM);
diff --git a/sys/netgraph/ng_l2tp.c b/sys/netgraph/ng_l2tp.c
index 46a817c..d24b321 100644
--- a/sys/netgraph/ng_l2tp.c
+++ b/sys/netgraph/ng_l2tp.c
@@ -428,7 +428,8 @@ ng_l2tp_newhook(node_p node, hook_p hook, const char *name)
return (EINVAL);
/* Create hook private structure */
- hpriv = malloc( sizeof(*hpriv), M_NETGRAPH_L2TP, M_NOWAIT | M_ZERO);
+ hpriv = malloc(sizeof(*hpriv),
+ M_NETGRAPH_L2TP, M_NOWAIT | M_ZERO);
if (hpriv == NULL)
return (ENOMEM);
hpriv->conf.session_id = session_id;
diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c
index 2a7198f..2e9d932 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -295,7 +295,8 @@ ng_mppc_rcvmsg(node_p node, item_p item, hook_p lasthook)
d->history = NULL;
}
if ((cfg->bits & MPPC_BIT) != 0) {
- d->history = malloc( isComp ? MPPC_SizeOfCompressionHistory() :
+ d->history = malloc(isComp ?
+ MPPC_SizeOfCompressionHistory() :
MPPC_SizeOfDecompressionHistory(),
M_NETGRAPH_MPPC, M_NOWAIT);
if (d->history == NULL)
OpenPOWER on IntegriCloud