svn commit: r560245 - head/benchmarks/iperf/files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Jan  3 20:44:50 2021
New Revision: 560245
URL: https://svnweb.freebsd.org/changeset/ports/560245

Log:
  Fix build on armv6
  
  PR:		251448
  Submitted by:	Martin Birgmeier <d8zNeCFG at aon.at>

Modified:
  head/benchmarks/iperf/files/patch-src-Settings.cpp

Modified: head/benchmarks/iperf/files/patch-src-Settings.cpp
==============================================================================
--- head/benchmarks/iperf/files/patch-src-Settings.cpp	Sun Jan  3 20:30:07 2021	(r560244)
+++ head/benchmarks/iperf/files/patch-src-Settings.cpp	Sun Jan  3 20:44:50 2021	(r560245)
@@ -9,3 +9,39 @@
  	    // fill out the formats in the event they are needed per an time error
  	    char start_timebuf[80];
  	    struct tm ts = *localtime(&mExtSettings->txstart_epoch.tv_sec);
+@@ -1731,13 +1731,13 @@ int Settings_GenerateClientHdr (struct thread_Settings
+ 	    if (isFullDuplex(client) || isReverse(client)) {
+ 		upperflags |= HEADER_ISOCH_SETTINGS;
+ 		hdr->isoch_settings.FPSl = htonl((long)(client->mFPS));
+-		hdr->isoch_settings.FPSu = htonl(((client->mFPS - (long)(client->mFPS)) * rMillion));
++		hdr->isoch_settings.FPSu = htonl((long)((client->mFPS - (long)(client->mFPS)) * rMillion));
+ 		hdr->isoch_settings.Meanl = htonl((long)(client->mMean));
+-		hdr->isoch_settings.Meanu = htonl((((client->mMean) - (long)(client->mMean)) * rMillion));
++		hdr->isoch_settings.Meanu = htonl((long)(((client->mMean) - (long)(client->mMean)) * rMillion));
+ 		hdr->isoch_settings.Variancel = htonl((long)(client->mVariance));
+-		hdr->isoch_settings.Varianceu = htonl(((client->mVariance - (long)(client->mVariance)) * rMillion));
++		hdr->isoch_settings.Varianceu = htonl((long)((client->mVariance - (long)(client->mVariance)) * rMillion));
+ 		hdr->isoch_settings.BurstIPGl = htonl((long)(client->mBurstIPG));
+-		hdr->isoch_settings.BurstIPGu = htonl(((client->mBurstIPG - (long)(client->mBurstIPG)) * rMillion));
++		hdr->isoch_settings.BurstIPGu = htonl((long)((client->mBurstIPG - (long)(client->mBurstIPG)) * rMillion));
+ 		len += sizeof(struct client_hdrext_isoch_settings);
+ 	    }
+ 	}
+@@ -1822,13 +1822,13 @@ int Settings_GenerateClientHdr (struct thread_Settings
+ 	    upperflags |= HEADER_ISOCH;
+ 	    if (isFullDuplex(client) || isReverse(client)) {
+ 		upperflags |= HEADER_ISOCH_SETTINGS;
+-		hdr->isoch_settings.FPSl = htonl(client->mFPS);
++		hdr->isoch_settings.FPSl = htonl((long)client->mFPS);
+ 		hdr->isoch_settings.FPSu = htonl(((long)(client->mFPS) - (long)client->mFPS * rMillion));
+-		hdr->isoch_settings.Meanl = htonl(client->mMean);
++		hdr->isoch_settings.Meanl = htonl((long)client->mMean);
+ 		hdr->isoch_settings.Meanu = htonl(((long)(client->mMean) - (long)client->mMean * rMillion));
+-		hdr->isoch_settings.Variancel = htonl(client->mVariance);
++		hdr->isoch_settings.Variancel = htonl((long)client->mVariance);
+ 		hdr->isoch_settings.Varianceu = htonl(((long)(client->mVariance) - (long)client->mVariance * rMillion));
+-		hdr->isoch_settings.BurstIPGl = htonl(client->mBurstIPG);
++		hdr->isoch_settings.BurstIPGl = htonl((long)client->mBurstIPG);
+ 		hdr->isoch_settings.BurstIPGu = htonl(((long)(client->mBurstIPG) - (long)client->mBurstIPG * rMillion));
+ 		len += sizeof(struct client_hdrext_isoch_settings);
+ 	    }