diff options
| author | wollman <wollman@FreeBSD.org> | 1996-04-26 18:32:58 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1996-04-26 18:32:58 +0000 |
| commit | c9ab94c87851a11ea16d63c4d8871163784d2f90 (patch) | |
| tree | 8f081e0ba595063c369760ab4ca922e569ff59f7 /sys/netinet/tcp_var.h | |
| parent | 411e2af1bd2ec848d539381f8f00a3da5401690c (diff) | |
| download | FreeBSD-src-c9ab94c87851a11ea16d63c4d8871163784d2f90.zip FreeBSD-src-c9ab94c87851a11ea16d63c4d8871163784d2f90.tar.gz | |
Delete #ifdef notdef blocks containing old method of srtt calculation.
Requested by: davidg
Diffstat (limited to 'sys/netinet/tcp_var.h')
| -rw-r--r-- | sys/netinet/tcp_var.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 3035143..f8ad951 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_var.h 8.4 (Berkeley) 5/24/95 - * $Id: tcp_var.h,v 1.30 1996/02/27 15:12:53 bde Exp $ + * $Id: tcp_var.h,v 1.31 1996/03/22 18:09:21 wollman Exp $ */ #ifndef _NETINET_TCP_VAR_H_ @@ -191,18 +191,11 @@ struct rmxp_tao { * and thus an "ALPHA" of 0.875. rttvar has 2 bits to the right of the * binary point, and is smoothed with an ALPHA of 0.75. */ -#ifdef notdef -#define TCP_RTT_SCALE 8 /* multiplier for srtt; 3 bits frac. */ -#define TCP_RTT_SHIFT 3 /* shift for srtt; 3 bits frac. */ -#define TCP_RTTVAR_SCALE 4 /* multiplier for rttvar; 2 bits */ -#define TCP_RTTVAR_SHIFT 2 /* shift for rttvar; 2 bits */ -#else #define TCP_RTT_SCALE 32 /* multiplier for srtt; 3 bits frac. */ #define TCP_RTT_SHIFT 5 /* shift for srtt; 3 bits frac. */ #define TCP_RTTVAR_SCALE 16 /* multiplier for rttvar; 2 bits */ #define TCP_RTTVAR_SHIFT 4 /* shift for rttvar; 2 bits */ #define TCP_DELTA_SHIFT 2 /* see tcp_input.c */ -#endif /* * The initial retransmission should happen at rtt + 4 * rttvar. @@ -214,25 +207,15 @@ struct rmxp_tao { * 1.5 tick we need. But, because the bias is * statistical, we have to test that we don't drop below * the minimum feasible timer (which is 2 ticks). -#ifdef notdef - * This macro assumes that the value of TCP_RTTVAR_SCALE - * is the same as the multiplier for rttvar. -#else * This version of the macro adapted from a paper by Lawrence * Brakmo and Larry Peterson which outlines a problem caused * by insufficient precision in the original implementation, * which results in inappropriately large RTO values for very * fast networks. -#endif */ -#ifdef notdef -#define TCP_REXMTVAL(tp) \ - (((tp)->t_srtt >> TCP_RTT_SHIFT) + (tp)->t_rttvar) -#else #define TCP_REXMTVAL(tp) \ ((((tp)->t_srtt >> (TCP_RTT_SHIFT - TCP_RTTVAR_SHIFT)) \ + ((tp)->t_rttvar) >> TCP_RTTVAR_SHIFT)) -#endif /* XXX * We want to avoid doing m_pullup on incoming packets but that |
