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/netatalk | |
| 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/netatalk')
| -rw-r--r-- | sys/netatalk/ddp_input.c | 2 | ||||
| -rw-r--r-- | sys/netatalk/ddp_pcb.c | 10 | ||||
| -rw-r--r-- | sys/netatalk/ddp_usrreq.c | 10 |
3 files changed, 2 insertions, 20 deletions
diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c index f9a06c8..4ef497b 100644 --- a/sys/netatalk/ddp_input.c +++ b/sys/netatalk/ddp_input.c @@ -410,9 +410,7 @@ ddp_input( m, ifp, elh, phase ) /* * And wake up whatever might be waiting for it */ - SOCK_LOCK(ddp->ddp_socket); sorwakeup( ddp->ddp_socket ); - SOCK_UNLOCK(ddp->ddp_socket); } #if 0 diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c index 63932cc..fa79cec 100644 --- a/sys/netatalk/ddp_pcb.c +++ b/sys/netatalk/ddp_pcb.c @@ -110,11 +110,8 @@ ddp_connect(struct socket *so, struct sockaddr *nam, struct thread *td) s = splnet(); error = at_pcbconnect( ddp, nam, td ); splx(s); - if ( error == 0 ) { - SOCK_LOCK( so ); + if ( error == 0 ) soisconnected( so ); - SOCK_UNLOCK( so ); - } return(error); } @@ -137,9 +134,7 @@ ddp_disconnect(struct socket *so) at_pcbdisconnect( ddp ); ddp->ddp_fsat.sat_addr.s_node = ATADDR_ANYNODE; splx(s); - SOCK_LOCK( so ); soisdisconnected( so ); - SOCK_UNLOCK( so ); return(0); } @@ -209,9 +204,7 @@ ddp_abort(struct socket *so) if ( ddp == NULL ) { return(EINVAL); } - SOCK_LOCK( so ); soisdisconnected( so ); - SOCK_UNLOCK( so ); s = splnet(); at_pcbdetach( so, ddp ); splx(s); @@ -447,7 +440,6 @@ at_pcballoc( struct socket *so ) static void at_pcbdetach( struct socket *so, struct ddpcb *ddp) { - SOCK_LOCK( so ); soisdisconnected( so ); so->so_pcb = 0; sotryfree(so); diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c index 63932cc..fa79cec 100644 --- a/sys/netatalk/ddp_usrreq.c +++ b/sys/netatalk/ddp_usrreq.c @@ -110,11 +110,8 @@ ddp_connect(struct socket *so, struct sockaddr *nam, struct thread *td) s = splnet(); error = at_pcbconnect( ddp, nam, td ); splx(s); - if ( error == 0 ) { - SOCK_LOCK( so ); + if ( error == 0 ) soisconnected( so ); - SOCK_UNLOCK( so ); - } return(error); } @@ -137,9 +134,7 @@ ddp_disconnect(struct socket *so) at_pcbdisconnect( ddp ); ddp->ddp_fsat.sat_addr.s_node = ATADDR_ANYNODE; splx(s); - SOCK_LOCK( so ); soisdisconnected( so ); - SOCK_UNLOCK( so ); return(0); } @@ -209,9 +204,7 @@ ddp_abort(struct socket *so) if ( ddp == NULL ) { return(EINVAL); } - SOCK_LOCK( so ); soisdisconnected( so ); - SOCK_UNLOCK( so ); s = splnet(); at_pcbdetach( so, ddp ); splx(s); @@ -447,7 +440,6 @@ at_pcballoc( struct socket *so ) static void at_pcbdetach( struct socket *so, struct ddpcb *ddp) { - SOCK_LOCK( so ); soisdisconnected( so ); so->so_pcb = 0; sotryfree(so); |
