Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[linux-2.6-microblaze.git] / tools / testing / selftests / net / tcp_mmap.c

diff --git a/tools/testing/selftests/net/tcp_mmap.c b/tools/testing/selftests/net/tcp_mmap.c
index 5bb370a..35505b3 100644 (file)
--- a/tools/testing/selftests/net/tcp_mmap.c
+++ b/tools/testing/selftests/net/tcp_mmap.c
@@ -71,7 +71,7 @@
 #define MSG_ZEROCOPY    0x4000000
 #endif
 
-#define FILE_SZ (1UL << 35)
+#define FILE_SZ (1ULL << 35)
 static int cfg_family = AF_INET6;
 static socklen_t cfg_alen = sizeof(struct sockaddr_in6);
 static int cfg_port = 8787;
@@ -165,7 +165,7 @@ void *child_thread(void *arg)
                        socklen_t zc_len = sizeof(zc);
                        int res;
 
-                       zc.address = (__u64)addr;
+                       zc.address = (__u64)((unsigned long)addr);
                        zc.length = chunk_size;
                        zc.recv_skip_hint = 0;
                        res = getsockopt(fd, IPPROTO_TCP, TCP_ZEROCOPY_RECEIVE,
@@ -341,7 +341,7 @@ int main(int argc, char *argv[])
 {
        struct sockaddr_storage listenaddr, addr;
        unsigned int max_pacing_rate = 0;
-       unsigned long total = 0;
+       size_t total = 0;
        char *host = NULL;
        int fd, c, on = 1;
        char *buffer;
@@ -470,7 +470,7 @@ int main(int argc, char *argv[])
                zflg = 0;
        }
        while (total < FILE_SZ) {
-               long wr = FILE_SZ - total;
+               ssize_t wr = FILE_SZ - total;
 
                if (wr > chunk_size)
                        wr = chunk_size;