IB/mlx4: Move mlx4_uverbs_ex_query_device_resp to include/uapi/

This struct is involved in the user API for mlx4 and should not be hidden
inside a driver header file.

Fixes: 09d208b258a2 ("IB/mlx4: Add report for RSS capabilities by vendor channel")
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index e14919c15b06e620dad56a91587928f06e1939e7..d0640bd79679df8df5fae080da5e2c949daefedb 100644 (file)
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -645,20 +645,6 @@ enum query_device_resp_mask {
        QUERY_DEVICE_RESP_MASK_TIMESTAMP = 1UL << 0,
 };
 
-struct mlx4_ib_rss_caps {
-       __u64 rx_hash_fields_mask; /* enum mlx4_rx_hash_fields */
-       __u8 rx_hash_function; /* enum mlx4_rx_hash_function_flags */
-       __u8 reserved[7];
-};
-
-struct mlx4_uverbs_ex_query_device_resp {
-       __u32                   comp_mask;
-       __u32                   response_length;
-       __u64                   hca_core_clock_offset;
-       __u32                   max_inl_recv_sz;
-       struct mlx4_ib_rss_caps rss_caps;
-};
-
 static inline struct mlx4_ib_dev *to_mdev(struct ib_device *ibdev)
 {
        return container_of(ibdev, struct mlx4_ib_dev, ib_dev);

diff --git a/include/uapi/rdma/mlx4-abi.h b/include/uapi/rdma/mlx4-abi.h
index 7f9c37346613e04ce60d95cce5297d9d2200d56c..d84616adff3264ed91155f3ed5cbe599e69de48d 100644 (file)
--- a/include/uapi/rdma/mlx4-abi.h
+++ b/include/uapi/rdma/mlx4-abi.h
@@ -156,4 +156,18 @@ enum mlx4_ib_rx_hash_fields {
        MLX4_IB_RX_HASH_INNER           = 1ULL << 31,
 };
 
+struct mlx4_ib_rss_caps {
+       __u64 rx_hash_fields_mask; /* enum mlx4_ib_rx_hash_fields */
+       __u8 rx_hash_function; /* enum mlx4_ib_rx_hash_function_flags */
+       __u8 reserved[7];
+};
+
+struct mlx4_uverbs_ex_query_device_resp {
+       __u32                   comp_mask;
+       __u32                   response_length;
+       __u64                   hca_core_clock_offset;
+       __u32                   max_inl_recv_sz;
+       struct mlx4_ib_rss_caps rss_caps;
+};
+
 #endif /* MLX4_ABI_USER_H */