D23160.id67371.diff
No OneTemporary
Actions

Size

570 B

Referenced Files

None

Subscribers

None

D23160.id67371.diff
View Options

	Index: sys/netinet/tcp_sack.c
	===================================================================
	--- sys/netinet/tcp_sack.c
	+++ sys/netinet/tcp_sack.c
	@@ -774,7 +774,11 @@
	int num_segs = 1;

	INP_WLOCK_ASSERT(tp->t_inpcb);
	- tcp_timer_activate(tp, TT_REXMT, 0);
	+ if (tcp_timer_active(tp, TT_PERSIST)) {
	+ tcp_timer_activate(tp, TT_PERSIST, 0);
	+ tp->t_rxtshift = 0;
	+ }
	+ tcp_timer_activate(tp, TT_REXMT, tp->t_rxtcur);
	tp->t_rtttime = 0;
	/* Send one or 2 segments based on how much new data was acked. */
	if ((BYTES_THIS_ACK(tp, th) / tp->t_maxseg) >= 2)