Date: Sat, 16 Jan 2016 17:53:04 +0000 (UTC) From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r294173 - stable/10/sys/netinet Message-ID: <201601161753.u0GHr456052867@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tuexen Date: Sat Jan 16 17:53:04 2016 New Revision: 294173 URL: https://svnweb.freebsd.org/changeset/base/294173 Log: MFC r289240: Fix the timeout for INIT retransmissions in the case where RTO_MIN is smaller than RTO_INITIAL. Modified: stable/10/sys/netinet/sctp_timer.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netinet/sctp_timer.c ============================================================================== --- stable/10/sys/netinet/sctp_timer.c Sat Jan 16 17:50:43 2016 (r294172) +++ stable/10/sys/netinet/sctp_timer.c Sat Jan 16 17:53:04 2016 (r294173) @@ -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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601161753.u0GHr456052867>