summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/netinet/tcp_output.c2
-rw-r--r--sys/netinet/tcp_subr.c4
-rw-r--r--sys/netinet/tcp_timewait.c4
3 files changed, 1 insertions, 9 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index eb614cc..f6afc18 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -200,7 +200,7 @@ again:
sack_rxmit = 0;
len = 0;
p = NULL;
- if (tp->sack_enable && SEQ_LT(tp->snd_una,tp->snd_recover) &&
+ if (tp->sack_enable && IN_FASTRECOVERY(tp) &&
(p = tcp_sack_output(tp))) {
KASSERT(tp->snd_cwnd >= 0,
("%s: CWIN is negative : %ld", __func__, tp->snd_cwnd));
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 4ae8658..9c9ac7f 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -207,10 +207,6 @@ int tcp_do_sack = 1;
SYSCTL_INT(_net_inet_tcp_sack, OID_AUTO, enable, CTLFLAG_RW,
&tcp_do_sack, 0, "Enable/Disable TCP SACK support");
-int tcp_sackhole_limit = 10 * 1024; /* Arbitrarily set */
-SYSCTL_INT(_net_inet_tcp_sack, OID_AUTO, sackhole_limit, CTLFLAG_RW,
- &tcp_sackhole_limit, 0, "Limit on the total SACK scoreboard elements");
-
uma_zone_t sack_hole_zone;
static struct inpcb *tcp_notify(struct inpcb *, int);
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 4ae8658..9c9ac7f 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -207,10 +207,6 @@ int tcp_do_sack = 1;
SYSCTL_INT(_net_inet_tcp_sack, OID_AUTO, enable, CTLFLAG_RW,
&tcp_do_sack, 0, "Enable/Disable TCP SACK support");
-int tcp_sackhole_limit = 10 * 1024; /* Arbitrarily set */
-SYSCTL_INT(_net_inet_tcp_sack, OID_AUTO, sackhole_limit, CTLFLAG_RW,
- &tcp_sackhole_limit, 0, "Limit on the total SACK scoreboard elements");
-
uma_zone_t sack_hole_zone;
static struct inpcb *tcp_notify(struct inpcb *, int);
OpenPOWER on IntegriCloud