svn commit: r289240 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Tue Oct 13 18:27:55 2015
New Revision: 289240
URL: https://svnweb.freebsd.org/changeset/base/289240

Log:
  Fix the timeout for INIT retransmissions in the case where RTO_MIN is
  smaller than RTO_INITIAL.
  
  MFC after:	1 week

Modified:
  head/sys/netinet/sctp_timer.c

Modified: head/sys/netinet/sctp_timer.c
==============================================================================
--- head/sys/netinet/sctp_timer.c	Tue Oct 13 18:23:51 2015	(r289239)
+++ head/sys/netinet/sctp_timer.c	Tue Oct 13 18:27:55 2015	(r289240)
@@ -408,7 +408,11 @@ sctp_backoff_on_timeout(struct sctp_tcb 
     int num_marked, int num_abandoned)
 {
 	if (net->RTO == 0) {
-		net->RTO = stcb->asoc.minrto;
+		if (net->RTO_measured) {
+			net->RTO = stcb->asoc.minrto;
+		} else {
+			net->RTO = stcb->asoc.initial_rto;
+		}
 	}
 	net->RTO <<= 1;
 	if (net->RTO > stcb->asoc.maxrto) {