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/netkey | |
| 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/netkey')
| -rw-r--r-- | sys/netkey/keysock.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c index c69af30..68f1045 100644 --- a/sys/netkey/keysock.c +++ b/sys/netkey/keysock.c @@ -174,9 +174,7 @@ key_sendup0(rp, m, promisc) error = ENOBUFS; } else error = 0; - SOCK_LOCK(rp->rcb_socket); sorwakeup(rp->rcb_socket); - SOCK_UNLOCK(rp->rcb_socket); return error; } @@ -429,10 +427,8 @@ key_attach(struct socket *so, int proto, struct thread *td) key_cb.any_count++; kp->kp_raw.rcb_laddr = &key_src; kp->kp_raw.rcb_faddr = &key_dst; - SOCK_LOCK(so); - soisconnected(so); + soisconnected_locked(so); so->so_options |= SO_USELOOPBACK; - SOCK_UNLOCK(so); splx(s); return 0; |
