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/netatm/atm_aal5.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/netatm/atm_aal5.c')
| -rw-r--r-- | sys/netatm/atm_aal5.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c index 63caed2..ab6a95a 100644 --- a/sys/netatm/atm_aal5.c +++ b/sys/netatm/atm_aal5.c @@ -771,24 +771,19 @@ atm_aal5_cpcs_data(tok, m) * Ensure that the socket is able to receive data and * that there's room in the socket buffer */ - SOCK_LOCK(so); if (((so->so_state & SS_ISCONNECTED) == 0) || (so->so_state & SS_CANTRCVMORE) || (len > sbspace(&so->so_rcv))) { - SOCK_UNLOCK(so); atm_sock_stat.as_indrop[atp->atp_type]++; KB_FREEALL(m); return; } - SOCK_UNLOCK(so); /* * Queue the data and notify the user */ sbappendrecord(&so->so_rcv, m); - SOCK_LOCK(so); sorwakeup(so); - SOCK_UNLOCK(so); return; } @@ -840,12 +835,9 @@ atm_aal5_ctloutput(so, sopt) case T_ATM_ADD_LEAF: case T_ATM_DROP_LEAF: - SOCK_LOCK(so); if ((so->so_state & SS_ISCONNECTED) == 0) { - SOCK_UNLOCK(so); ATM_RETERR(ENOTCONN); - } else - SOCK_UNLOCK(so); + } break; case T_ATM_CAUSE: @@ -853,12 +845,9 @@ atm_aal5_ctloutput(so, sopt) break; default: - SOCK_LOCK(so); if (so->so_state & SS_ISCONNECTED) { - SOCK_UNLOCK(so); ATM_RETERR(EISCONN); - } else - SOCK_UNLOCK(so); + } break; } |
