From e6fa9b9e922913444c2e6b2b58bf3de5eaed868d Mon Sep 17 00:00:00 2001
From: tanimura <tanimura@FreeBSD.org>
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/net/raw_usrreq.c | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'sys/net/raw_usrreq.c')

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;
 }
 
-- 
cgit v1.1