diff options
| author | Rafael Vanoni <rafael.vanoni@sun.com> | 2009-11-18 17:58:26 -0800 |
|---|---|---|
| committer | Rafael Vanoni <rafael.vanoni@sun.com> | 2009-11-18 17:58:26 -0800 |
| commit | 1b7f7204f8aa806a57b84cdeba100d819be85a61 (patch) | |
| tree | 33e778c07f0a66e0ed58aeba97c6ae037b3510cf /usr/src/uts/common/inet/tcp/tcp.c | |
| parent | e4dd1ad64731752083b2d75f34ed5ca7a0f83ff0 (diff) | |
| download | illumos-joyent-1b7f7204f8aa806a57b84cdeba100d819be85a61.tar.gz | |
6901962 Tickless clock made tcp confuse 32 and 64 bit timestamps
6902263 latent struct sizing bug in clock_init()
Diffstat (limited to 'usr/src/uts/common/inet/tcp/tcp.c')
| -rw-r--r-- | usr/src/uts/common/inet/tcp/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp.c b/usr/src/uts/common/inet/tcp/tcp.c index 3a22e6362d..6d5e2d35c1 100644 --- a/usr/src/uts/common/inet/tcp/tcp.c +++ b/usr/src/uts/common/inet/tcp/tcp.c @@ -12422,7 +12422,7 @@ tcp_paws_check(tcp_t *tcp, tcpha_t *tcpha, tcp_opt_t *tcpoptp) if ((flags & TH_RST) == 0 && TSTMP_LT(tcpoptp->tcp_opt_ts_val, tcp->tcp_ts_recent)) { - if (TSTMP_LT(LBOLT_FASTPATH, + if (TSTMP_LT(LBOLT_FASTPATH64, tcp->tcp_last_rcv_lbolt + PAWS_TIMEOUT)) { /* This segment is not acceptable. */ return (B_FALSE); @@ -15570,7 +15570,7 @@ data_null: } if ((tcp->tcp_suna == snxt) && !tcp->tcp_localnet && - (TICK_TO_MSEC((clock_t)LBOLT_FASTPATH - tcp->tcp_last_recv_time) >= + (TICK_TO_MSEC(LBOLT_FASTPATH - tcp->tcp_last_recv_time) >= tcp->tcp_rto)) { SET_TCP_INIT_CWND(tcp, mss, tcps->tcps_slow_start_after_idle); } |