summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authortanimura <tanimura@FreeBSD.org>2002-06-18 07:42:02 +0000
committertanimura <tanimura@FreeBSD.org>2002-06-18 07:42:02 +0000
commitcb3347e926b2f55441b5b402a984b3cf1f946ff7 (patch)
treef42aca06eba2e1816711ad9e437466e635000f8f /sys/netinet
parentf54b57d4885c98f03395b425fd8092addebf028d (diff)
downloadFreeBSD-src-cb3347e926b2f55441b5b402a984b3cf1f946ff7.zip
FreeBSD-src-cb3347e926b2f55441b5b402a984b3cf1f946ff7.tar.gz
Remove so*_locked(), which were backed out by mistake.
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/accf_data.c2
-rw-r--r--sys/netinet/accf_http.c6
-rw-r--r--sys/netinet/tcp_input.c2
-rw-r--r--sys/netinet/tcp_reass.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/netinet/accf_data.c b/sys/netinet/accf_data.c
index 46c92e3..2058b06 100644
--- a/sys/netinet/accf_data.c
+++ b/sys/netinet/accf_data.c
@@ -62,6 +62,6 @@ sohasdata(struct socket *so, void *arg, int waitflag)
so->so_upcall = NULL;
so->so_rcv.sb_flags &= ~SB_UPCALL;
- soisconnected_locked(so);
+ soisconnected(so);
return;
}
diff --git a/sys/netinet/accf_http.c b/sys/netinet/accf_http.c
index 4a3e17e..686e563 100644
--- a/sys/netinet/accf_http.c
+++ b/sys/netinet/accf_http.c
@@ -203,7 +203,7 @@ fallout:
DPRINT("fallout");
so->so_upcall = NULL;
so->so_rcv.sb_flags &= ~SB_UPCALL;
- soisconnected_locked(so);
+ soisconnected(so);
return;
}
@@ -285,7 +285,7 @@ fallout:
DPRINT("fallout");
so->so_upcall = NULL;
so->so_rcv.sb_flags &= ~SB_UPCALL;
- soisconnected_locked(so);
+ soisconnected(so);
return;
}
@@ -355,6 +355,6 @@ readmore:
gotit:
so->so_upcall = NULL;
so->so_rcv.sb_flags &= ~SB_UPCALL;
- soisconnected_locked(so);
+ soisconnected(so);
return;
}
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 68f9bc6..95d21ce 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1871,7 +1871,7 @@ process_ACK:
* we'll hang forever.
*/
if (so->so_state & SS_CANTRCVMORE) {
- soisdisconnected_locked(so);
+ soisdisconnected(so);
callout_reset(tp->tt_2msl, tcp_maxidle,
tcp_timer_2msl, tp);
}
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 68f9bc6..95d21ce 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -1871,7 +1871,7 @@ process_ACK:
* we'll hang forever.
*/
if (so->so_state & SS_CANTRCVMORE) {
- soisdisconnected_locked(so);
+ soisdisconnected(so);
callout_reset(tp->tt_2msl, tcp_maxidle,
tcp_timer_2msl, tp);
}
OpenPOWER on IntegriCloud