diff options
| author | blu <none@none> | 2006-03-31 09:34:31 -0800 |
|---|---|---|
| committer | blu <none@none> | 2006-03-31 09:34:31 -0800 |
| commit | 7283501aee15755d16f82d34cd71ebbc0bf5f2af (patch) | |
| tree | 6d269135f05ee56463260b6bc84c1fc8f195477f /usr | |
| parent | fdf855a7bee8a77bedd222e0fa01b4207ef14952 (diff) | |
| download | illumos-gate-7283501aee15755d16f82d34cd71ebbc0bf5f2af.tar.gz | |
6332821 TCP fails to deliver data following URGENT data until next packet arrives.
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/uts/common/inet/tcp/tcp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp.c b/usr/src/uts/common/inet/tcp/tcp.c index 002ef63b89..9e92e82437 100644 --- a/usr/src/uts/common/inet/tcp/tcp.c +++ b/usr/src/uts/common/inet/tcp/tcp.c @@ -14523,9 +14523,8 @@ est: if (!canputnext(tcp->tcp_rq)) tcp->tcp_rwnd -= seg_len; } - } else if (((flags & (TH_PUSH|TH_FIN)) || - tcp->tcp_rcv_cnt + seg_len >= tcp->tcp_rq->q_hiwat >> 3) && - (sqp != NULL)) { + } else if ((flags & (TH_PUSH|TH_FIN)) || + tcp->tcp_rcv_cnt + seg_len >= tcp->tcp_rq->q_hiwat >> 3) { if (tcp->tcp_rcv_list != NULL) { /* * Enqueue the new segment first and then @@ -14565,8 +14564,7 @@ est: * for a push bit. This provides resiliency against * implementations that do not correctly generate push bits. */ - if ((sqp != NULL) && tcp->tcp_rcv_list != NULL && - tcp->tcp_push_tid == 0) { + if (tcp->tcp_rcv_list != NULL && tcp->tcp_push_tid == 0) { /* * The connection may be closed at this point, so don't * do anything for a detached tcp. |