diff options
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/accf_data.c | 8 | ||||
| -rw-r--r-- | sys/netinet/accf_http.c | 8 | ||||
| -rw-r--r-- | sys/netinet/tcp_input.c | 6 | ||||
| -rw-r--r-- | sys/netinet/tcp_reass.c | 6 |
4 files changed, 1 insertions, 27 deletions
diff --git a/sys/netinet/accf_data.c b/sys/netinet/accf_data.c index dd710e6..46c92e3 100644 --- a/sys/netinet/accf_data.c +++ b/sys/netinet/accf_data.c @@ -30,11 +30,9 @@ #include <sys/param.h> #include <sys/kernel.h> -#include <sys/lock.h> #include <sys/sysctl.h> #include <sys/signalvar.h> #include <sys/socketvar.h> -#include <sys/sx.h> /* accept filter that holds a socket until data arrives */ @@ -59,15 +57,11 @@ static void sohasdata(struct socket *so, void *arg, int waitflag) { - SIGIO_SLOCK(); - if (!soreadable(so)) { - SIGIO_SUNLOCK(); + if (!soreadable(so)) return; - } so->so_upcall = NULL; so->so_rcv.sb_flags &= ~SB_UPCALL; soisconnected_locked(so); - SIGIO_SUNLOCK(); return; } diff --git a/sys/netinet/accf_http.c b/sys/netinet/accf_http.c index 3109174..4a3e17e 100644 --- a/sys/netinet/accf_http.c +++ b/sys/netinet/accf_http.c @@ -31,12 +31,10 @@ #include <sys/param.h> #include <sys/kernel.h> -#include <sys/lock.h> #include <sys/mbuf.h> #include <sys/signalvar.h> #include <sys/sysctl.h> #include <sys/socketvar.h> -#include <sys/sx.h> /* check for GET/HEAD */ static void sohashttpget(struct socket *so, void *arg, int waitflag); @@ -203,11 +201,9 @@ sohashttpget(struct socket *so, void *arg, int waitflag) fallout: DPRINT("fallout"); - SIGIO_SLOCK(); so->so_upcall = NULL; so->so_rcv.sb_flags &= ~SB_UPCALL; soisconnected_locked(so); - SIGIO_SUNLOCK(); return; } @@ -287,11 +283,9 @@ readmore: fallout: DPRINT("fallout"); - SIGIO_SLOCK(); so->so_upcall = NULL; so->so_rcv.sb_flags &= ~SB_UPCALL; soisconnected_locked(so); - SIGIO_SUNLOCK(); return; } @@ -359,10 +353,8 @@ readmore: return; gotit: - SIGIO_SLOCK(); so->so_upcall = NULL; so->so_rcv.sb_flags &= ~SB_UPCALL; soisconnected_locked(so); - SIGIO_SUNLOCK(); return; } diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 2a78e5e..b193327 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/kernel.h> -#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/proc.h> /* for proc0 declaration */ @@ -50,7 +49,6 @@ #include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/sx.h> #include <sys/sysctl.h> #include <sys/syslog.h> #include <sys/systm.h> @@ -1845,14 +1843,10 @@ process_ACK: * specification, but if we don't get a FIN * we'll hang forever. */ - SIGIO_SLOCK(); if (so->so_state & SS_CANTRCVMORE) { soisdisconnected_locked(so); - SIGIO_SUNLOCK(); callout_reset(tp->tt_2msl, tcp_maxidle, tcp_timer_2msl, tp); - } else { - SIGIO_SUNLOCK(); } tp->t_state = TCPS_FIN_WAIT_2; } diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 2a78e5e..b193327 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/kernel.h> -#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/proc.h> /* for proc0 declaration */ @@ -50,7 +49,6 @@ #include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/sx.h> #include <sys/sysctl.h> #include <sys/syslog.h> #include <sys/systm.h> @@ -1845,14 +1843,10 @@ process_ACK: * specification, but if we don't get a FIN * we'll hang forever. */ - SIGIO_SLOCK(); if (so->so_state & SS_CANTRCVMORE) { soisdisconnected_locked(so); - SIGIO_SUNLOCK(); callout_reset(tp->tt_2msl, tcp_maxidle, tcp_timer_2msl, tp); - } else { - SIGIO_SUNLOCK(); } tp->t_state = TCPS_FIN_WAIT_2; } |
