summaryrefslogtreecommitdiff
path: root/sys/netinet/tcp_input.c
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2004-06-24 02:57:12 +0000
committerRobert Watson <rwatson@FreeBSD.org>2004-06-24 02:57:12 +0000
commit927c5cea3f67b47cda445901fde585f1bd7fbdb7 (patch)
tree07b27d1e23cffcf83e3053d2a1cc5074ccc7e704 /sys/netinet/tcp_input.c
parenta82b25f9b23d656e4b667c404e4b468d26af804d (diff)
Notes
Diffstat (limited to 'sys/netinet/tcp_input.c')
-rw-r--r--sys/netinet/tcp_input.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index cab335470748..ef1d02cd3a72 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -2295,13 +2295,12 @@ step6:
*/
if (SEQ_GT(th->th_seq+th->th_urp, tp->rcv_up)) {
tp->rcv_up = th->th_seq + th->th_urp;
+ SOCKBUF_LOCK(&so->so_rcv);
so->so_oobmark = so->so_rcv.sb_cc +
(tp->rcv_up - tp->rcv_nxt) - 1;
- if (so->so_oobmark == 0) {
- SOCKBUF_LOCK(&so->so_rcv);
+ if (so->so_oobmark == 0)
so->so_rcv.sb_state |= SBS_RCVATMARK;
- SOCKBUF_UNLOCK(&so->so_rcv);
- }
+ SOCKBUF_UNLOCK(&so->so_rcv);
sohasoutofband(so);
tp->t_oobflags &= ~(TCPOOB_HAVEDATA | TCPOOB_HADDATA);
}