summaryrefslogtreecommitdiffstats
path: root/sys/netgraph/ng_ksocket.c
diff options
context:
space:
mode:
authorandre <andre@FreeBSD.org>2012-10-18 13:57:24 +0000
committerandre <andre@FreeBSD.org>2012-10-18 13:57:24 +0000
commit34a9a386cb4df8844bca8e43dae20e4a15710fcc (patch)
tree822857ae1f88eb65d6756450fb5600f0644b00d1 /sys/netgraph/ng_ksocket.c
parentbec3d0dcde51da4b3b1a5bc9fbea92a5353a57ed (diff)
downloadFreeBSD-src-34a9a386cb4df8844bca8e43dae20e4a15710fcc.zip
FreeBSD-src-34a9a386cb4df8844bca8e43dae20e4a15710fcc.tar.gz
Mechanically remove the last stray remains of spl* calls from net*/*.
They have been Noop's for a long time now.
Diffstat (limited to 'sys/netgraph/ng_ksocket.c')
-rw-r--r--sys/netgraph/ng_ksocket.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c
index cacb524..15c8ce0 100644
--- a/sys/netgraph/ng_ksocket.c
+++ b/sys/netgraph/ng_ksocket.c
@@ -1045,9 +1045,7 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2)
struct mbuf *m;
struct ng_mesg *response;
struct uio auio;
- int s, flags, error;
-
- s = splnet();
+ int flags, error;
/* so = priv->so; *//* XXX could have derived this like so */
KASSERT(so == priv->so, ("%s: wrong socket", __func__));
@@ -1094,10 +1092,8 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2)
* the hook gets created and is connected, this upcall function
* will be called again.
*/
- if (priv->hook == NULL) {
- splx(s);
+ if (priv->hook == NULL)
return;
- }
/* Read and forward available mbuf's */
auio.uio_td = NULL;
@@ -1165,7 +1161,6 @@ sendit: /* Forward data with optional peer sockaddr as packet tag */
}
priv->flags |= KSF_EOFSEEN;
}
- splx(s);
}
/*
OpenPOWER on IntegriCloud