Commit 11d26810 authored by David S. Miller's avatar David S. Miller

Merge branch 'selftests-net-Fix-clang-warnings-on-powerpc'

Tanner Love says:

====================
selftests/net: Fix clang warnings on powerpc

This is essentially a v2 of
http://patchwork.ozlabs.org/project/netdev/patch/20200724181757.2331172-1-tannerlove.kernel@gmail.com/,
but it has been split up in order to have only one "Fixes" tag per
patch.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5fd82200 94b6c13b
...@@ -350,7 +350,8 @@ static int test_datapath(uint16_t typeflags, int port_off, ...@@ -350,7 +350,8 @@ static int test_datapath(uint16_t typeflags, int port_off,
int fds[2], fds_udp[2][2], ret; int fds[2], fds_udp[2][2], ret;
fprintf(stderr, "\ntest: datapath 0x%hx ports %hu,%hu\n", fprintf(stderr, "\ntest: datapath 0x%hx ports %hu,%hu\n",
typeflags, PORT_BASE, PORT_BASE + port_off); typeflags, (uint16_t)PORT_BASE,
(uint16_t)(PORT_BASE + port_off));
fds[0] = sock_fanout_open(typeflags, 0); fds[0] = sock_fanout_open(typeflags, 0);
fds[1] = sock_fanout_open(typeflags, 0); fds[1] = sock_fanout_open(typeflags, 0);
......
...@@ -329,8 +329,7 @@ int main(int argc, char **argv) ...@@ -329,8 +329,7 @@ int main(int argc, char **argv)
bool all_tests = true; bool all_tests = true;
int arg_index = 0; int arg_index = 0;
int failures = 0; int failures = 0;
int s, t; int s, t, opt;
char opt;
while ((opt = getopt_long(argc, argv, "", long_options, while ((opt = getopt_long(argc, argv, "", long_options,
&arg_index)) != -1) { &arg_index)) != -1) {
......
...@@ -121,7 +121,7 @@ static bool do_recv_one(int fdr, struct timed_send *ts) ...@@ -121,7 +121,7 @@ static bool do_recv_one(int fdr, struct timed_send *ts)
if (rbuf[0] != ts->data) if (rbuf[0] != ts->data)
error(1, 0, "payload mismatch. expected %c", ts->data); error(1, 0, "payload mismatch. expected %c", ts->data);
if (labs(tstop - texpect) > cfg_variance_us) if (llabs(tstop - texpect) > cfg_variance_us)
error(1, 0, "exceeds variance (%d us)", cfg_variance_us); error(1, 0, "exceeds variance (%d us)", cfg_variance_us);
return false; return false;
......
...@@ -344,7 +344,7 @@ int main(int argc, char *argv[]) ...@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
{ {
struct sockaddr_storage listenaddr, addr; struct sockaddr_storage listenaddr, addr;
unsigned int max_pacing_rate = 0; unsigned int max_pacing_rate = 0;
size_t total = 0; uint64_t total = 0;
char *host = NULL; char *host = NULL;
int fd, c, on = 1; int fd, c, on = 1;
char *buffer; char *buffer;
...@@ -473,12 +473,12 @@ int main(int argc, char *argv[]) ...@@ -473,12 +473,12 @@ int main(int argc, char *argv[])
zflg = 0; zflg = 0;
} }
while (total < FILE_SZ) { while (total < FILE_SZ) {
ssize_t wr = FILE_SZ - total; int64_t wr = FILE_SZ - total;
if (wr > chunk_size) if (wr > chunk_size)
wr = chunk_size; wr = chunk_size;
/* Note : we just want to fill the pipe with 0 bytes */ /* Note : we just want to fill the pipe with 0 bytes */
wr = send(fd, buffer, wr, zflg ? MSG_ZEROCOPY : 0); wr = send(fd, buffer, (size_t)wr, zflg ? MSG_ZEROCOPY : 0);
if (wr <= 0) if (wr <= 0)
break; break;
total += wr; total += wr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment