Back out my lats commit of locking down a socket, it conflicts with hsu's work.

Requested by:	hsu

3 files changed, 3 insertions, 25 deletions

diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index f984699..7e45500 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -36,9 +36,7 @@
 
 #include <sys/param.h>
 #include <sys/domain.h>
-#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mutex.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
@@ -100,7 +98,6 @@ raw_detach(rp)
 	struct socket *so = rp->rcb_socket;
 
 	so->so_pcb = 0;
-	SOCK_LOCK(so);
 	sotryfree(so);
 	LIST_REMOVE(rp, list);
 #ifdef notdef
@@ -124,12 +121,8 @@ raw_disconnect(rp)
 		m_freem(dtom(rp->rcb_faddr));
 	rp->rcb_faddr = 0;
 #endif
-	SOCK_LOCK(rp->rcb_socket);
-	if (rp->rcb_socket->so_state & SS_NOFDREF) {
-		SOCK_UNLOCK(rp->rcb_socket);
+	if (rp->rcb_socket->so_state & SS_NOFDREF)
 		raw_detach(rp);
-	} else
-		SOCK_UNLOCK(rp->rcb_socket);
 }
 
 #ifdef notdef
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 631b2e8..7afab70 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -37,7 +37,6 @@
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mbuf.h>
-#include <sys/mutex.h>
 #include <sys/protosw.h>
 #include <sys/signalvar.h>
 #include <sys/socket.h>
@@ -106,9 +105,7 @@ raw_input(m0, proto, src, dst)
 					/* should notify about lost packet */
 					m_freem(n);
 				else {
-					SOCK_LOCK(last);
 					sorwakeup(last);
-					SOCK_UNLOCK(last);
 					sockets++;
 				}
 			}
@@ -120,9 +117,7 @@ raw_input(m0, proto, src, dst)
 		    m, (struct mbuf *)0) == 0)
 			m_freem(m);
 		else {
-			SOCK_LOCK(last);
 			sorwakeup(last);
-			SOCK_UNLOCK(last);
 			sockets++;
 		}
 	} else
@@ -150,11 +145,8 @@ raw_uabort(struct socket *so)
 	if (rp == 0)
 		return EINVAL;
 	raw_disconnect(rp);
-	SOCK_LOCK(so);
 	sotryfree(so);
-	SOCK_LOCK(so);
 	soisdisconnected(so);	/* XXX huh? called after the sofree()? */
-	SOCK_UNLOCK(so);
 	return 0;
 }
 
@@ -211,9 +203,7 @@ raw_udisconnect(struct socket *so)
 		return ENOTCONN;
 	}
 	raw_disconnect(rp);
-	SOCK_LOCK(so);
 	soisdisconnected(so);
-	SOCK_UNLOCK(so);
 	return 0;
 }
 
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 407d6f3..47031c2 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -147,10 +147,8 @@ rts_attach(struct socket *so, int proto, struct thread *td)
 	}
 	rp->rcb_faddr = &route_src;
 	route_cb.any_count++;
-	SOCK_LOCK(so);
-	soisconnected(so);
+	soisconnected_locked(so);
 	so->so_options |= SO_USELOOPBACK;
-	SOCK_UNLOCK(so);
 	splx(s);
 	return 0;
 }
@@ -474,9 +472,7 @@ flush:
 	/*
 	 * Check to see if we don't want our own messages.
 	 */
-	SOCK_LOCK(so);
 	if ((so->so_options & SO_USELOOPBACK) == 0) {
-		SOCK_UNLOCK(so);
 		if (route_cb.any_count <= 1) {
 			if (rtm)
 				Free(rtm);
@@ -485,8 +481,7 @@ flush:
 		}
 		/* There is another listener, so construct message */
 		rp = sotorawcb(so);
-	} else
-		SOCK_UNLOCK(so);
+	}
 	if (rtm) {
 		m_copyback(m, 0, rtm->rtm_msglen, (caddr_t)rtm);
 		if (m->m_pkthdr.len < rtm->rtm_msglen) {