D43768.1782946279.diff
No OneTemporary
Actions

Size

829 B

Referenced Files

None

Subscribers

None

D43768.1782946279.diff
View Options

	diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c
	--- a/sys/netinet/cc/cc.c
	+++ b/sys/netinet/cc/cc.c
	@@ -454,7 +454,7 @@
	void
	newreno_cc_cong_signal(struct cc_var *ccv, uint32_t type)
	{
	- uint32_t cwin, factor;
	+ uint32_t cwin, factor, pipe;
	u_int mss;

	cwin = CCV(ccv, snd_cwnd);
	@@ -489,9 +489,17 @@
	}
	break;
	case CC_RTO:
	- CCV(ccv, snd_ssthresh) = max(min(CCV(ccv, snd_wnd),
	- CCV(ccv, snd_cwnd)) / 2 / mss,
	- 2) * mss;
	+ if (CCV(ccv, t_rxtshift) == 1) {
	+ if (V_tcp_do_newsack) {
	+ pipe = tcp_compute_pipe(ccv->ccvc.tcp);
	+ } else {
	+ pipe = CCV(ccv, snd_nxt) -
	+ CCV(ccv, snd_fack) +
	+ CCV(ccv, sackhint.sack_bytes_rexmit);
	+ }
	+ CCV(ccv, snd_ssthresh) = max(2,
	+ min(CCV(ccv, snd_wnd), pipe) / 2 / mss) * mss;
	+ }
	CCV(ccv, snd_cwnd) = mss;
	break;
	}