diff options
| author | Julien Charbon <jch@FreeBSD.org> | 2015-08-24 09:30:27 +0000 |
|---|---|---|
| committer | Julien Charbon <jch@FreeBSD.org> | 2015-08-24 09:30:27 +0000 |
| commit | bcf9b91395edf2d7436b2f1cc3dc7be9f88b1e29 (patch) | |
| tree | 2725801172a768180c321d6aa74a5a14179cc965 /sys/netinet/tcp_timer.h | |
| parent | 21fc4292424dfa5890189a4bf060ee08300149e8 (diff) | |
| download | src-bcf9b91395edf2d7436b2f1cc3dc7be9f88b1e29.tar.gz src-bcf9b91395edf2d7436b2f1cc3dc7be9f88b1e29.zip | |
Revert r284245: "Fix a callout race condition introduced in TCP
timers callouts with r281599."
r281599 fixed a TCP timer race condition, but due a callout(9) bug
it also introduced another race condition workaround-ed with r284245.
The callout(9) bug being fixed with r286880, we can now revert the
workaround (r284245).
Differential Revision: https://reviews.freebsd.org/D2079 (Initial change)
Differential Revision: https://reviews.freebsd.org/D2763 (Workaround)
Differential Revision: https://reviews.freebsd.org/D3078 (Fix)
Sponsored by: Verisign, Inc.
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=287101
Diffstat (limited to 'sys/netinet/tcp_timer.h')
| -rw-r--r-- | sys/netinet/tcp_timer.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index 2758069097ef..cf06ff7ccdbd 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -159,12 +159,6 @@ struct tcp_timer { #define TT_2MSL 0x0010 #define TT_MASK (TT_DELACK|TT_REXMT|TT_PERSIST|TT_KEEP|TT_2MSL) -#define TT_DELACK_RST 0x0100 -#define TT_REXMT_RST 0x0200 -#define TT_PERSIST_RST 0x0400 -#define TT_KEEP_RST 0x0800 -#define TT_2MSL_RST 0x1000 - #define TT_STOPPED 0x00010000 #define TP_KEEPINIT(tp) ((tp)->t_keepinit ? (tp)->t_keepinit : tcp_keepinit) |