Merge tag 'lsk-v4.4-17.03-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

[firefly-linux-kernel-4.4.55.git] / include / rdma / ib_sa.h

diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h
index 301969552d0a51e34dcd872daa303a6339721916..b43e64d69734644ca9c4fb063938adaf86dbea24 100644 (file)
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
@@ -138,12 +138,12 @@ struct ib_sa_path_rec {
        union ib_gid sgid;
        __be16       dlid;
        __be16       slid;
-       int          raw_traffic;
+       u8           raw_traffic;
        /* reserved */
        __be32       flow_label;
        u8           hop_limit;
        u8           traffic_class;
-       int          reversible;
+       u8           reversible;
        u8           numb_path;
        __be16       pkey;
        __be16       qos_class;
@@ -204,7 +204,7 @@ struct ib_sa_mcmember_rec {
        u8           hop_limit;
        u8           scope;
        u8           join_state;
-       int          proxy_join;
+       u8           proxy_join;
 };
 
 /* Service Record Component Mask Sec 15.2.5.14 Ver 1.1 */