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/netinet/accf_data.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/netinet/accf_data.c')
-rw-r--r-- | sys/netinet/accf_data.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/netinet/accf_data.c b/sys/netinet/accf_data.c index 4470733..46c92e3 100644 --- a/sys/netinet/accf_data.c +++ b/sys/netinet/accf_data.c @@ -30,8 +30,6 @@ #include <sys/param.h> #include <sys/kernel.h> -#include <sys/lock.h> -#include <sys/mutex.h> #include <sys/sysctl.h> #include <sys/signalvar.h> #include <sys/socketvar.h> @@ -59,15 +57,11 @@ static void sohasdata(struct socket *so, void *arg, int waitflag) { - SOCK_LOCK(so); - if (!soreadable(so)) { - SOCK_UNLOCK(so); + if (!soreadable(so)) return; - } so->so_upcall = NULL; so->so_rcv.sb_flags &= ~SB_UPCALL; - soisconnected(so); - SOCK_UNLOCK(so); + soisconnected_locked(so); return; } |