d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that the t_peakrate_thr is not compiled in

Browse Source 
by default until NF can upstream it.

Reviewed by:	and suggested lstewart
Sponsored by:	Netflix Inc.
This commit is contained in:
rrs 2018-06-19 11:20:28 +00:00
parent 377f86ae2b
commit 1b6c300c4e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/netinet/tcp_stacks/rack.c
View File

@ -1206,7 +1206,7 @@ rack_ack_received(struct tcpcb *tp, struct tcp_rack *rack, struct tcphdr *th, ui
tp->t_stats_gput_prev); tp->t_stats_gput_prev);
tp->t_flags &= ~TF_GPUTINPROG; tp->t_flags &= ~TF_GPUTINPROG;
tp->t_stats_gput_prev = gput; tp->t_stats_gput_prev = gput;
#ifdef NETFLIX_CWV
if (tp->t_maxpeakrate) { if (tp->t_maxpeakrate) {
/* /*
* We update t_peakrate_thr. This gives us roughly * We update t_peakrate_thr. This gives us roughly
@ -1214,6 +1214,7 @@ rack_ack_received(struct tcpcb *tp, struct tcp_rack *rack, struct tcphdr *th, ui
*/ */
tcp_update_peakrate_thr(tp); tcp_update_peakrate_thr(tp);
} }
#endif
} }
#endif #endif
if (tp->snd_cwnd > tp->snd_ssthresh) { if (tp->snd_cwnd > tp->snd_ssthresh) {
@ -1267,11 +1268,11 @@ rack_ack_received(struct tcpcb *tp, struct tcp_rack *rack, struct tcphdr *th, ui
tcp_newcwv_update_pipeack(tp, data); tcp_newcwv_update_pipeack(tp, data);
} }
} }
#endif
/* we enforce max peak rate if it is set. */ /* we enforce max peak rate if it is set. */
if (tp->t_peakrate_thr && tp->snd_cwnd > tp->t_peakrate_thr) { if (tp->t_peakrate_thr && tp->snd_cwnd > tp->t_peakrate_thr) {
tp->snd_cwnd = tp->t_peakrate_thr; tp->snd_cwnd = tp->t_peakrate_thr;
} }
#endif
} }
static void static void