D59305.id185567.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D59305.id185567.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
	@@ -412,6 +412,9 @@
	else
	CCV(ccv, snd_cwnd) = CCV(ccv, snd_ssthresh);
	}
	+
	+ EXIT_RECOVERY(CCV(ccv, t_flags));
	+ CCV(ccv, snd_cwnd) = CCV(ccv, snd_ssthresh);
	}

	void
	diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c
	--- a/sys/netinet/cc/cc_cubic.c
	+++ b/sys/netinet/cc/cc_cubic.c
	@@ -566,6 +566,9 @@

	cubic_data->epoch_ack_count = 0;
	cubic_data->sum_rtt_usecs = 0;
	+
	+ EXIT_RECOVERY(CCV(ccv, t_flags));
	+ CCV(ccv, snd_cwnd) = CCV(ccv, snd_ssthresh);
	}

	/*
	diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c
	--- a/sys/netinet/cc/cc_htcp.c
	+++ b/sys/netinet/cc/cc_htcp.c
	@@ -388,6 +388,9 @@
	htcp_data->prev_cwnd / mss)
	>> HTCP_SHIFT)) * mss;
	}
	+
	+ EXIT_RECOVERY(CCV(ccv, t_flags));
	+ CCV(ccv, snd_cwnd) = CCV(ccv, snd_ssthresh);
	}

	static void
	diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
	--- a/sys/netinet/tcp_input.c
	+++ b/sys/netinet/tcp_input.c
	@@ -490,13 +490,11 @@
	tp->t_ccv.curack = th->th_ack;
	CC_ALGO(tp)->post_recovery(&tp->t_ccv);
	}
	- EXIT_RECOVERY(tp->t_flags);

	tp->t_bytes_acked = 0;
	tp->sackhint.delivered_data = 0;
	tp->sackhint.prr_delivered = 0;
	tp->sackhint.prr_out = 0;
	- tp->snd_cwnd = tp->snd_ssthresh;
	}

	/*