summaryrefslogtreecommitdiffstats
path: root/sys/netinet/tcp_input.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2008-06-12 15:13:47 +0000
committerjsing <jsing@openbsd.org>2008-06-12 15:13:47 +0000
commit77dc329bf707235d896b6d32b5772fdb46ca4c6c (patch)
treeede5f7114514b0988f28c9af16e1148d80defb8d /sys/netinet/tcp_input.c
parentANSIfy function definitions. (diff)
downloadwireguard-openbsd-77dc329bf707235d896b6d32b5772fdb46ca4c6c.tar.xz
wireguard-openbsd-77dc329bf707235d896b6d32b5772fdb46ca4c6c.zip
Remove some crazy #if mess.
ok markus@ henning@
Diffstat (limited to 'sys/netinet/tcp_input.c')
-rw-r--r--sys/netinet/tcp_input.c10
1 files changed, 2 insertions, 8 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);