diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2020-02-21 04:10:41 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2020-02-21 04:10:41 +0000 |
| commit | be3d57e69b0958090eaaada7c8f00f98eda00889 (patch) | |
| tree | 98eb49b789dd3fa3d6f34c10ae013add60747cf5 /sys/netgraph | |
| parent | 721a81c369ac039ad98c2caed4e25d5b338b5308 (diff) | |
| download | src-be3d57e69b0958090eaaada7c8f00f98eda00889.tar.gz src-be3d57e69b0958090eaaada7c8f00f98eda00889.zip | |
Revert one half of previous change r357558. Don't enter the epoch on
sends to control socket. Control socket messages can run constructors
of nodes and other stuff that is allowed to M_WAITOK.
PR: 244241
Notes
Notes:
svn path=/head/; revision=358193
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/ng_socket.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c index 6339ce0e2ccf..3ae5a31721aa 100644 --- a/sys/netgraph/ng_socket.c +++ b/sys/netgraph/ng_socket.c @@ -219,7 +219,6 @@ static int ngc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, struct mbuf *control, struct thread *td) { - struct epoch_tracker et; struct ngpcb *const pcbp = sotongpcb(so); struct ngsock *const priv = NG_NODE_PRIVATE(pcbp->sockdata->node); struct sockaddr_ng *const sap = (struct sockaddr_ng *) addr; @@ -338,9 +337,7 @@ ngc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, item->apply = &apply; priv->error = -1; - NET_EPOCH_ENTER(et); error = ng_snd_item(item, 0); - NET_EPOCH_EXIT(et); mtx_lock(&priv->mtx); if (priv->error == -1) |