diff options
| author |   jan <jan@openbsd.org> | 2021-02-08 19:37:15 +0000 |
|---|---|---|
| committer | jan <jan@openbsd.org> | 2021-02-08 19:37:15 +0000 |
| commit | d86f40e2e9bb725373092713e07da5e8c4df83fc (patch) | |
| tree | 43d686ac5580a3024b52bef069d851b8d6b628ca | |
| parent | sync (diff) | |
| download | wireguard-openbsd-d86f40e2e9bb725373092713e07da5e8c4df83fc.tar.xz wireguard-openbsd-d86f40e2e9bb725373092713e07da5e8c4df83fc.zip | |
Remove maxburst feature from tcp_output
OK bluhm@, claudio@, deraadt@
| -rw-r--r-- | sys/netinet/tcp.h | 4 | ||||
| -rw-r--r-- | sys/netinet/tcp_output.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 3fb7f47a011..085624ed5f7 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp.h,v 1.21 2019/07/10 18:45:31 bluhm Exp $ */ +/* $OpenBSD: tcp.h,v 1.22 2021/02/08 19:37:15 jan Exp $ */ /* $NetBSD: tcp.h,v 1.8 1995/04/17 05:32:58 cgd Exp $ */ /* @@ -105,8 +105,6 @@ struct tcphdr { #define TCP_MAX_SACK 3 /* Max # SACKs sent in any segment */ #define TCP_SACKHOLE_LIMIT 128 /* Max # SACK holes per connection */ -#define TCP_MAXBURST 4 /* Max # packets after leaving Fast Rxmit */ - /* * Default maximum segment size for TCP. * With an IP MSS of 576, this is 536, diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index f2d1516c27a..8d603d35699 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.129 2021/01/25 03:40:46 dlg Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.130 2021/02/08 19:37:15 jan Exp $ */ /* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */ /* @@ -203,7 +203,6 @@ tcp_output(struct tcpcb *tp) int idle, sendalot = 0; int i, sack_rxmit = 0; struct sackhole *p; - int maxburst = TCP_MAXBURST; #ifdef TCP_SIGNATURE unsigned int sigoff; #endif /* TCP_SIGNATURE */ @@ -1120,7 +1119,7 @@ out: tp->last_ack_sent = tp->rcv_nxt; tp->t_flags &= ~TF_ACKNOW; TCP_TIMER_DISARM(tp, TCPT_DELACK); - if (sendalot && --maxburst) + if (sendalot) goto again; return (0); } |