Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Sep 2012 07:03:56 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r240158 - head/sys/netinet
Message-ID:  <201209060703.q8673u2n077866@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tuexen
Date: Thu Sep  6 07:03:56 2012
New Revision: 240158
URL: http://svn.freebsd.org/changeset/base/240158

Log:
  Get rid of a gcc'ism.
  
  MFC after: 10 days

Modified:
  head/sys/netinet/sctp_cc_functions.c

Modified: head/sys/netinet/sctp_cc_functions.c
==============================================================================
--- head/sys/netinet/sctp_cc_functions.c	Thu Sep  6 06:17:39 2012	(r240157)
+++ head/sys/netinet/sctp_cc_functions.c	Thu Sep  6 07:03:56 2012	(r240158)
@@ -1917,10 +1917,9 @@ measure_achieved_throughput(struct sctp_
 		return;
 	}
 	net->cc_mod.htcp_ca.bytecount += net->net_ack;
-
-	if (net->cc_mod.htcp_ca.bytecount >= net->cwnd - ((net->cc_mod.htcp_ca.alpha >> 7 ? : 1) * net->mtu)
-	    && now - net->cc_mod.htcp_ca.lasttime >= net->cc_mod.htcp_ca.minRTT
-	    && net->cc_mod.htcp_ca.minRTT > 0) {
+	if ((net->cc_mod.htcp_ca.bytecount >= net->cwnd - (((net->cc_mod.htcp_ca.alpha >> 7) ? (net->cc_mod.htcp_ca.alpha >> 7) : 1) * net->mtu)) &&
+	    (now - net->cc_mod.htcp_ca.lasttime >= net->cc_mod.htcp_ca.minRTT) &&
+	    (net->cc_mod.htcp_ca.minRTT > 0)) {
 		uint32_t cur_Bi = net->cc_mod.htcp_ca.bytecount / net->mtu * hz / (now - net->cc_mod.htcp_ca.lasttime);
 
 		if (htcp_ccount(&net->cc_mod.htcp_ca) <= 3) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209060703.q8673u2n077866>