diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -34,7 +34,7 @@ .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd August 1, 2022 +.Dd October 4, 2022 .Dt TCP 4 .Os .Sh NAME diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1679,12 +1679,12 @@ * A timestamp received in a SYN makes * it ok to send timestamp requests and replies. */ - if (to->to_flags & TOF_TS) { + if ((to->to_flags & TOF_TS) && !(V_tcp_do_rfc1323 == 2)) { sc->sc_tsreflect = to->to_tsval; sc->sc_flags |= SCF_TIMESTAMP; sc->sc_tsoff = tcp_new_ts_offset(inc); } - if (to->to_flags & TOF_SCALE) { + if ((to->to_flags & TOF_SCALE) && !(V_tcp_do_rfc1323 == 3)) { int wscale = 0; /*