svn commit: r358193 - head/sys/netgraph

[Gleb Smirnoff]

Author: glebius
Date: Fri Feb 21 04:10:41 2020
New Revision: 358193
URL: https://svnweb.freebsd.org/changeset/base/358193

Log:
  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

Modified:
  head/sys/netgraph/ng_socket.c

Modified: head/sys/netgraph/ng_socket.c
==============================================================================
--- head/sys/netgraph/ng_socket.c	Fri Feb 21 01:44:31 2020	(r358192)
+++ head/sys/netgraph/ng_socket.c	Fri Feb 21 04:10:41 2020	(r358193)
@@ -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,
 	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)