Merge tag 'for_v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[linux.git] / include / rdma / ib_cm.h

diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index c10f4b5ea8ab5298beaba7070f588408532d9f61..49f4f75499b3eb46487b1c93b9fc7f23abcc18df 100644 (file)
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -583,7 +583,7 @@ struct ib_cm_sidr_req_param {
        struct sa_path_rec      *path;
        const struct ib_gid_attr *sgid_attr;
        __be64                  service_id;
-       int                     timeout_ms;
+       unsigned long           timeout_ms;
        const void              *private_data;
        u8                      private_data_len;
        u8                      max_cm_retries;