diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2008-06-12 15:13:48 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2008-06-12 15:13:48 +0000 |
| commit | b20c3776b182bdc029a6ab0f723b1ea14576130c (patch) | |
| tree | 08f45923c92aff3f00f069f6dfd7ab12921634ca /sys/netinet | |
| parent | ef3d51cb652f1f438b01dca29e018e458a1f3274 (diff) | |
Remove some crazy #if mess.
ok markus@ henning@
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/tcp_input.c | 10 | ||||
| -rw-r--r-- | sys/netinet/tcp_output.c | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 7ede91d45e3..5812996fb88 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.217 2008/06/12 15:08:47 jsing Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.218 2008/06/12 15:13:47 jsing Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -1642,19 +1642,15 @@ trimthenstep6: if (win < 2) win = 2; tp->snd_ssthresh = win * tp->t_maxseg; -#if defined(TCP_SACK) - tp->snd_last = tp->snd_max; -#endif #ifdef TCP_SACK + tp->snd_last = tp->snd_max; if (tp->sack_enable) { TCP_TIMER_DISARM(tp, TCPT_REXMT); tp->t_rtttime = 0; #ifdef TCP_ECN tp->t_flags |= TF_SEND_CWR; #endif -#if 1 /* TCP_ECN */ tcpstat.tcps_cwr_frecovery++; -#endif tcpstat.tcps_sack_recovery_episode++; #if defined(TCP_SACK) && defined(TCP_FACK) tp->t_dupacks = tcprexmtthresh; @@ -1683,9 +1679,7 @@ trimthenstep6: #ifdef TCP_ECN tp->t_flags |= TF_SEND_CWR; #endif -#if 1 /* TCP_ECN */ tcpstat.tcps_cwr_frecovery++; -#endif tcpstat.tcps_sndrexmitfast++; (void) tcp_output(tp); diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 3a01b9811f9..2e4480cdbb9 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.82 2008/06/12 15:08:47 jsing Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.83 2008/06/12 15:13:47 jsing Exp $ */ /* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */ /* @@ -218,8 +218,6 @@ tcp_output(struct tcpcb *tp) #ifdef TCP_SACK int i, sack_rxmit = 0; struct sackhole *p; -#endif -#if defined(TCP_SACK) int maxburst = TCP_MAXBURST; #endif #ifdef TCP_SIGNATURE @@ -293,9 +291,7 @@ again: (p = tcp_sack_output(tp))) { off = p->rxmit - tp->snd_una; sack_rxmit = 1; -#if 0 /* Coalesce holes into a single retransmission */ -#endif len = min(tp->t_maxseg, p->end - p->rxmit); #ifndef TCP_FACK /* in FACK, hold snd_cwnd constant during recovery */ |