D51725.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51725.diff
View Options

	diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
	--- a/sys/netinet/tcp_output.c
	+++ b/sys/netinet/tcp_output.c
	@@ -1250,7 +1250,7 @@
	* fack acks recoverypoint.
	*/
	if ((tp->t_flags & TF_LRD) && SEQ_GEQ(p->rxmit, p->end))
	- p->rxmit = tp->snd_recover;
	+ p->rxmit = SEQ_MAX(p->rxmit, tp->snd_recover);
	tp->sackhint.sack_bytes_rexmit += len;
	}
	if (IN_RECOVERY(tp->t_flags)) {
	diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
	--- a/sys/netinet/tcp_sack.c
	+++ b/sys/netinet/tcp_sack.c
	@@ -816,7 +816,7 @@
	cur->end = sblkp->start;
	cur->rxmit = SEQ_MIN(cur->rxmit, cur->end);
	if ((tp->t_flags & TF_LRD) && SEQ_GEQ(cur->rxmit, cur->end))
	- cur->rxmit = tp->snd_recover;
	+ cur->rxmit = SEQ_MAX(cur->rxmit, tp->snd_recover);
	} else {
	/*
	* ACKs some data in middle of a hole; need
	@@ -843,7 +843,7 @@
	cur->rxmit = SEQ_MIN(cur->rxmit,
	cur->end);
	if ((tp->t_flags & TF_LRD) && SEQ_GEQ(cur->rxmit, cur->end))
	- cur->rxmit = tp->snd_recover;
	+ cur->rxmit = SEQ_MAX(cur->rxmit, tp->snd_recover);
	delivered_data += (sblkp->end - sblkp->start);
	}
	}