Author: tuexen
Date: Sun Jul  7 11:36:46 2013
New Revision: 252928
URL: http://svnweb.freebsd.org/changeset/base/252928

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

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

Modified: stable/9/sys/netinet/sctp_cc_functions.c
==============================================================================
--- stable/9/sys/netinet/sctp_cc_functions.c    Sun Jul  7 11:33:51 2013        
(r252927)
+++ stable/9/sys/netinet/sctp_cc_functions.c    Sun Jul  7 11:36:46 2013        
(r252928)
@@ -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) {
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"

Reply via email to