Commit 670cd684 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Shuah Khan
Browse files

selftests: net: Fix printf format warnings on arm 



Fix printf format warnings on arm (and other 32bit arch).

 - udpgso.c and udpgso_bench_tx use %lu for size_t but it
   should be unsigned long long on 32bit arch.

 - so_txtime.c uses %ld for int64_t, but it should be
   unsigned long long on 32bit arch.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Cc: Willem de Bruijn <willemb@google.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent e698a237

tools/testing/selftests/net/so_txtime.c

+2 −2
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ static void do_recv_one(int fdr, struct timed_send *ts) 
	tstop = (gettime_ns() - glob_tstart) / 1000;

	texpect = ts->delay_us >= 0 ? ts->delay_us : 0;



	fprintf(stderr, "payload:%c delay:%ld expected:%ld (us)\n",

			rbuf[0], tstop, texpect);

	fprintf(stderr, "payload:%c delay:%lld expected:%lld (us)\n",

			rbuf[0], (long long)tstop, (long long)texpect);



	if (rbuf[0] != ts->data)

		error(1, 0, "payload mismatch. expected %c", ts->data);

tools/testing/selftests/net/udpgso.c

+2 −1
Original line number Diff line number Diff line
@@ -448,7 +448,8 @@ static bool __send_one(int fd, struct msghdr *msg, int flags) 
	if (ret == -1)

		error(1, errno, "sendmsg");

	if (ret != msg->msg_iov->iov_len)

		error(1, 0, "sendto: %d != %lu", ret, msg->msg_iov->iov_len);

		error(1, 0, "sendto: %d != %llu", ret,

			(unsigned long long)msg->msg_iov->iov_len);

	if (msg->msg_flags)

		error(1, 0, "sendmsg: return flags 0x%x\n", msg->msg_flags);

tools/testing/selftests/net/udpgso_bench_tx.c

+2 −1
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ static int send_udp_segment(int fd, char *data) 
	if (ret == -1)

		error(1, errno, "sendmsg");

	if (ret != iov.iov_len)

		error(1, 0, "sendmsg: %u != %lu\n", ret, iov.iov_len);

		error(1, 0, "sendmsg: %u != %llu\n", ret,

			(unsigned long long)iov.iov_len);



	return 1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE