D34062.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D34062.diff
View Options

	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
	@@ -1648,9 +1648,10 @@
	to.to_tsecr -= tp->ts_offset;
	if (TSTMP_GT(to.to_tsecr, tcp_ts_getticks()))
	to.to_tsecr = 0;
	- else if (tp->t_flags & TF_PREVVALID &&
	- tp->t_rxtshift == 1 &&
	- tp->t_badrxtwin != 0 && SEQ_LT(to.to_tsecr, tp->t_badrxtwin))
	+ else if (tp->t_rxtshift == 1 &&
	+ tp->t_flags & TF_PREVVALID &&
	+ tp->t_badrxtwin != 0 &&
	+ TSTMP_LT(to.to_tsecr, tp->t_badrxtwin))
	cc_cong_signal(tp, th, CC_RTO_ERR);
	}
	/*
	@@ -1807,7 +1808,8 @@
	if ((to.to_flags & TOF_TS) == 0 &&
	tp->t_rxtshift == 1 &&
	tp->t_flags & TF_PREVVALID &&
	- (int)(ticks - tp->t_badrxtwin) < 0) {
	+ tp->t_badrxtwin != 0 &&
	+ TSTMP_LT(ticks, tp->t_badrxtwin)) {
	cc_cong_signal(tp, th, CC_RTO_ERR);
	}

	@@ -2884,8 +2886,10 @@
	*/
	if (tp->t_rxtshift == 1 &&
	tp->t_flags & TF_PREVVALID &&
	- tp->t_badrxtwin &&
	- SEQ_LT(to.to_tsecr, tp->t_badrxtwin))
	+ tp->t_badrxtwin != 0 &&
	+ to.to_flags & TOF_TS &&
	+ to.to_tsecr != 0 &&
	+ TSTMP_LT(to.to_tsecr, tp->t_badrxtwin))
	cc_cong_signal(tp, th, CC_RTO_ERR);

	/*