On Tue, Oct 15, 2019 at 10:54:19AM +0300, Leon Romanovsky wrote:
> From: Yishai Hadas <yishaih@xxxxxxxxxxxx>
>
> Drop the dependency of ib_user_ioctl_verbs.h on ib_user_verbs.h which
> is not really required.
>
> Signed-off-by: Yishai Hadas <yishaih@xxxxxxxxxxxx>
> Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
> include/uapi/rdma/ib_user_ioctl_verbs.h | 26 ++++++++++++++++++++++++-
> include/uapi/rdma/ib_user_verbs.h | 25 ------------------------
> 2 files changed, 25 insertions(+), 26 deletions(-)
>
> diff --git a/include/uapi/rdma/ib_user_ioctl_verbs.h b/include/uapi/rdma/ib_user_ioctl_verbs.h
> index 9019b2d906ea..8bdfdd4ef8b5 100644
> +++ b/include/uapi/rdma/ib_user_ioctl_verbs.h
> @@ -35,7 +35,6 @@
> #define IB_USER_IOCTL_VERBS_H
>
> #include <linux/types.h>
> -#include <rdma/ib_user_verbs.h>
>
> #ifndef RDMA_UAPI_PTR
> #define RDMA_UAPI_PTR(_type, _name) __aligned_u64 _name
> @@ -167,6 +166,31 @@ enum ib_uverbs_advise_mr_flag {
> IB_UVERBS_ADVISE_MR_FLAG_FLUSH = 1 << 0,
> };
>
> +struct ib_uverbs_query_port_resp {
> + __u32 port_cap_flags; /* see ib_uverbs_query_port_cap_flags */
> + __u32 max_msg_sz;
> + __u32 bad_pkey_cntr;
> + __u32 qkey_viol_cntr;
> + __u32 gid_tbl_len;
> + __u16 pkey_tbl_len;
> + __u16 lid;
> + __u16 sm_lid;
> + __u8 state;
> + __u8 max_mtu;
> + __u8 active_mtu;
> + __u8 lmc;
> + __u8 max_vl_num;
> + __u8 sm_sl;
> + __u8 subnet_timeout;
> + __u8 init_type_reply;
> + __u8 active_width;
> + __u8 active_speed;
> + __u8 phys_state;
> + __u8 link_layer;
> + __u8 flags; /* see ib_uverbs_query_port_flags */
> + __u8 reserved;
> +};
Still don't understand why this is being moved here, not this one:
> struct ib_uverbs_query_port_resp_ex {
> struct ib_uverbs_query_port_resp legacy_resp;
> __u16 port_cap_flags2;
Moved to its proper place
Neither of these belong in this header
Jason
