Mercurial > illumos > illumos-gate
changeset 12818:1eda4f2ee0e0
6964207 the FireEngine project seems to have backed out the fix for 4840464
| author | George Shepherd <George.Shepherd@Sun.COM> |
|---|---|
| date | Mon, 12 Jul 2010 08:34:38 -0700 |
| parents | 288ae711509e |
| children | 9a65e7dafc13 |
| files | usr/src/uts/common/inet/tcp.h usr/src/uts/common/inet/tcp/tcp_input.c |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/inet/tcp.h Fri Jul 09 21:00:59 2010 -0700 +++ b/usr/src/uts/common/inet/tcp.h Mon Jul 12 08:34:38 2010 -0700 @@ -155,7 +155,7 @@ uint32_t tcp_ts_recent; /* Timestamp of earliest unacked */ /* data segment */ clock_t tcp_rto; /* Round trip timeout */ - clock_t tcp_last_rcv_lbolt; + int64_t tcp_last_rcv_lbolt; /* lbolt on last packet, used for PAWS */ uint32_t tcp_rto_initial; /* Initial RTO */ uint32_t tcp_rto_min; /* Minimum RTO */
--- a/usr/src/uts/common/inet/tcp/tcp_input.c Fri Jul 09 21:00:59 2010 -0700 +++ b/usr/src/uts/common/inet/tcp/tcp_input.c Mon Jul 12 08:34:38 2010 -0700 @@ -715,8 +715,8 @@ if ((flags & TH_RST) == 0 && TSTMP_LT(tcpoptp->tcp_opt_ts_val, tcp->tcp_ts_recent)) { - if (TSTMP_LT(LBOLT_FASTPATH64, - tcp->tcp_last_rcv_lbolt + PAWS_TIMEOUT)) { + if (LBOLT_FASTPATH64 < + (tcp->tcp_last_rcv_lbolt + PAWS_TIMEOUT)) { /* This segment is not acceptable. */ return (B_FALSE); } else {