svn commit: r247987 - stable/8/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Fri Mar  8 00:05:15 2013
New Revision: 247987
URL: http://svnweb.freebsd.org/changeset/base/247987

Log:
  MFC r240158:
  
  Get rid of a gcc'ism.

Modified:
  stable/8/sys/netinet/sctp_cc_functions.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/netinet/sctp_cc_functions.c
==============================================================================
--- stable/8/sys/netinet/sctp_cc_functions.c	Fri Mar  8 00:03:31 2013	(r247986)
+++ stable/8/sys/netinet/sctp_cc_functions.c	Fri Mar  8 00:05:15 2013	(r247987)
@@ -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) {