summaryrefslogtreecommitdiffstats
path: root/sys/netinet/tcp_output.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_output.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_output.c')
-rw-r--r--sys/netinet/tcp_output.c6
1 files changed, 1 insertions, 5 deletions
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 */