From e6fa9b9e922913444c2e6b2b58bf3de5eaed868d Mon Sep 17 00:00:00 2001 From: tanimura Date: Fri, 31 May 2002 11:52:35 +0000 Subject: Back out my lats commit of locking down a socket, it conflicts with hsu's work. Requested by: hsu --- sys/netgraph/ng_socket.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'sys/netgraph/ng_socket.c') diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c index 312b36b..09d1c46 100644 --- a/sys/netgraph/ng_socket.c +++ b/sys/netgraph/ng_socket.c @@ -734,9 +734,7 @@ ship_msg(struct ngpcb *pcbp, struct ng_mesg *msg, struct sockaddr_ng *addr) m_freem(mdata); return (ENOBUFS); } - SOCK_LOCK(so); sorwakeup(so); - SOCK_UNLOCK(so); return (0); } @@ -772,13 +770,9 @@ ngs_connect(hook_p hook) if ((priv->datasock) && (priv->datasock->ng_socket)) { if (NG_NODE_NUMHOOKS(node) == 1) { - SOCK_LOCK(priv->datasock->ng_socket); priv->datasock->ng_socket->so_state |= SS_ISCONNECTED; - SOCK_UNLOCK(priv->datasock->ng_socket); } else { - SOCK_LOCK(priv->datasock->ng_socket); priv->datasock->ng_socket->so_state &= ~SS_ISCONNECTED; - SOCK_UNLOCK(priv->datasock->ng_socket); } } return (0); @@ -892,9 +886,7 @@ ngs_rcvdata(hook_p hook, item_p item) TRAP_ERROR; return (ENOBUFS); } - SOCK_LOCK(so); sorwakeup(so); - SOCK_UNLOCK(so); return (0); } @@ -913,13 +905,9 @@ ngs_disconnect(hook_p hook) if ((priv->datasock) && (priv->datasock->ng_socket)) { if (NG_NODE_NUMHOOKS(node) == 1) { - SOCK_LOCK(priv->datasock->ng_socket); priv->datasock->ng_socket->so_state |= SS_ISCONNECTED; - SOCK_UNLOCK(priv->datasock->ng_socket); } else { - SOCK_LOCK(priv->datasock->ng_socket); priv->datasock->ng_socket->so_state &= ~SS_ISCONNECTED; - SOCK_UNLOCK(priv->datasock->ng_socket); } } @@ -944,17 +932,13 @@ ngs_shutdown(node_p node) struct ngpcb *const pcbp = priv->ctlsock; if (dpcbp != NULL) { - SOCK_LOCK(dpcbp->ng_socket); soisdisconnected(dpcbp->ng_socket); - SOCK_UNLOCK(dpcbp->ng_socket); dpcbp->sockdata = NULL; priv->datasock = NULL; priv->refs--; } if (pcbp != NULL) { - SOCK_LOCK(pcbp->ng_socket); soisdisconnected(pcbp->ng_socket); - SOCK_UNLOCK(pcbp->ng_socket); pcbp->sockdata = NULL; priv->ctlsock = NULL; priv->refs--; -- cgit v1.1