diff options
| author | Rao Shoaib <Rao.Shoaib@Sun.COM> | 2009-08-31 01:15:32 -0700 |
|---|---|---|
| committer | Rao Shoaib <Rao.Shoaib@Sun.COM> | 2009-08-31 01:15:32 -0700 |
| commit | 1b2702b494a01df0140f24a8df16385fa762f619 (patch) | |
| tree | f47e1ebcd3097e86cc6771df593a318c03dba6f1 /usr/src/uts/common/inet/tcp/tcp_fusion.c | |
| parent | 33ab04ab97e6a2ee82971255446a0aa4eace756e (diff) | |
| download | illumos-joyent-1b2702b494a01df0140f24a8df16385fa762f619.tar.gz | |
6874614 Reproducible assertion fail "peer_tcp->tcp_recv_hiwater != 0" in snv_122
Diffstat (limited to 'usr/src/uts/common/inet/tcp/tcp_fusion.c')
| -rw-r--r-- | usr/src/uts/common/inet/tcp/tcp_fusion.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp_fusion.c b/usr/src/uts/common/inet/tcp/tcp_fusion.c index a14492f848..3f056d1b1c 100644 --- a/usr/src/uts/common/inet/tcp/tcp_fusion.c +++ b/usr/src/uts/common/inet/tcp/tcp_fusion.c @@ -951,11 +951,6 @@ tcp_fuse_set_rcv_hiwat(tcp_t *tcp, size_t rwnd) /* Ensure that value is within the maximum upper bound */ if (rwnd > tcps->tcps_max_buf) rwnd = tcps->tcps_max_buf; - - /* Obey the absolute minimum tcp receive high water mark */ - if (rwnd < tcps->tcps_sth_rcv_hiwat) - rwnd = tcps->tcps_sth_rcv_hiwat; - /* * Round up to system page size in case SO_RCVBUF is modified * after SO_SNDBUF; the latter is also similarly rounded up. @@ -967,6 +962,7 @@ tcp_fuse_set_rcv_hiwat(tcp_t *tcp, size_t rwnd) * purposes in tcp_fuse_output(). */ tcp->tcp_recv_hiwater = rwnd; + tcp->tcp_rwnd = tcp->tcp_recv_hiwater; return (rwnd); } |