svn commit: r335364 - head/sys/netinet/tcp_stacks
Randall Stewart
rrs at FreeBSD.org
Tue Jun 19 11:20:29 UTC 2018
Author: rrs
Date: Tue Jun 19 11:20:28 2018
New Revision: 335364
URL: https://svnweb.freebsd.org/changeset/base/335364
Log:
Make sure that the t_peakrate_thr is not compiled in
by default until NF can upstream it.
Reviewed by: and suggested lstewart
Sponsored by: Netflix Inc.
Modified:
head/sys/netinet/tcp_stacks/rack.c
Modified: head/sys/netinet/tcp_stacks/rack.c
==============================================================================
--- head/sys/netinet/tcp_stacks/rack.c Tue Jun 19 11:06:36 2018 (r335363)
+++ head/sys/netinet/tcp_stacks/rack.c Tue Jun 19 11:20:28 2018 (r335364)
@@ -1206,7 +1206,7 @@ rack_ack_received(struct tcpcb *tp, struct tcp_rack *r
tp->t_stats_gput_prev);
tp->t_flags &= ~TF_GPUTINPROG;
tp->t_stats_gput_prev = gput;
-
+#ifdef NETFLIX_CWV
if (tp->t_maxpeakrate) {
/*
* We update t_peakrate_thr. This gives us roughly
@@ -1214,6 +1214,7 @@ rack_ack_received(struct tcpcb *tp, struct tcp_rack *r
*/
tcp_update_peakrate_thr(tp);
}
+#endif
}
#endif
if (tp->snd_cwnd > tp->snd_ssthresh) {
@@ -1267,11 +1268,11 @@ rack_ack_received(struct tcpcb *tp, struct tcp_rack *r
tcp_newcwv_update_pipeack(tp, data);
}
}
-#endif
/* we enforce max peak rate if it is set. */
if (tp->t_peakrate_thr && tp->snd_cwnd > tp->t_peakrate_thr) {
tp->snd_cwnd = tp->t_peakrate_thr;
}
+#endif
}
static void
More information about the svn-src-head
mailing list