diff options
| author | tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
|---|---|---|
| committer | tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
| commit | e6fa9b9e922913444c2e6b2b58bf3de5eaed868d (patch) | |
| tree | 9d5f24794525313566896ab89aa860515db344a6 /sys/net/raw_cb.c | |
| parent | 1ea6cbb8c29088e04528460633798a6c131ca1ba (diff) | |
| download | FreeBSD-src-e6fa9b9e922913444c2e6b2b58bf3de5eaed868d.zip FreeBSD-src-e6fa9b9e922913444c2e6b2b58bf3de5eaed868d.tar.gz | |
Back out my lats commit of locking down a socket, it conflicts with hsu's work.
Requested by: hsu
Diffstat (limited to 'sys/net/raw_cb.c')
| -rw-r--r-- | sys/net/raw_cb.c | 9 |
1 files changed, 1 insertions, 8 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 |
