diff options
| author | bz <bz@FreeBSD.org> | 2008-04-20 18:36:59 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2008-04-20 18:36:59 +0000 |
| commit | 7bd2ed43dc3cf9d79e4408003a978c8a1dca218a (patch) | |
| tree | 84fb8ef4b8400cad79cc755bda0acce8fecacdb2 /sys | |
| parent | dd210c8edd2eaddc33be0acd91d1561700060487 (diff) | |
| download | FreeBSD-src-7bd2ed43dc3cf9d79e4408003a978c8a1dca218a.zip FreeBSD-src-7bd2ed43dc3cf9d79e4408003a978c8a1dca218a.tar.gz | |
Revert to rev. 1.161 - switch back to optimized TCP options ordering.
A lot of testing has shown that the problem people were seeing was due
to invalid padding after the end of option list option, which was corrected
in tcp_output.c rev. 1.146.
Thanks to: anders@, s3raphi, Matt Reimer
Thanks to: Doug Hardie and Randy Rose, John Mayer, Susan Guzzardi
Special thanks to: dwhite@ and BitGravity
Discussed with: silby
MFC after: 1 day
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/tcp_var.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 3f18842..afb0150 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -238,17 +238,14 @@ struct tcpcb { * to tcp_dooptions and tcp_addoptions. * The binary order of the to_flags is relevant for packing of the * options in tcp_addoptions. - * SACK should be kept after TS; some broken cable modem / router - * devices were found in the field that ignore SYN-ACKs with - * SACK before TS. */ struct tcpopt { u_long to_flags; /* which options are present */ #define TOF_MSS 0x0001 /* maximum segment size */ #define TOF_SCALE 0x0002 /* window scaling */ +#define TOF_SACKPERM 0x0004 /* SACK permitted */ #define TOF_TS 0x0010 /* timestamp */ -#define TOF_SIGNATURE 0x0020 /* TCP-MD5 signature option (RFC2385) */ -#define TOF_SACKPERM 0x0040 /* SACK permitted */ +#define TOF_SIGNATURE 0x0040 /* TCP-MD5 signature option (RFC2385) */ #define TOF_SACK 0x0080 /* Peer sent SACK option */ #define TOF_MAXOPT 0x0100 u_int32_t to_tsval; /* new timestamp */ |
