diff options
author | Leon Romanovsky <leonro@mellanox.com> | 2016-09-04 13:30:31 +0200 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-01-10 18:41:40 +0100 |
commit | 06393bc39e2fdcd9ca281401f25fa3b834bca799 (patch) | |
tree | 3555ccf277a26242ea91a6a8cbfe25e5ac15c4be | |
parent | RDMA/core: Commonize RDMA IOCTL declarations location (diff) | |
download | linux-06393bc39e2fdcd9ca281401f25fa3b834bca799.tar.xz linux-06393bc39e2fdcd9ca281401f25fa3b834bca799.zip |
RDMA/core: Move legacy MAD IOCTL declarations to common file
Move legacy MAD IOCTL declarations to rdma_user_ioctl.h file.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Haggai Eran <haggaie@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r-- | include/uapi/rdma/ib_user_mad.h | 10 | ||||
-rw-r--r-- | include/uapi/rdma/rdma_user_ioctl.h | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/include/uapi/rdma/ib_user_mad.h b/include/uapi/rdma/ib_user_mad.h index 9de7a2b273d7..5c7abd859e0f 100644 --- a/include/uapi/rdma/ib_user_mad.h +++ b/include/uapi/rdma/ib_user_mad.h @@ -230,14 +230,4 @@ struct ib_user_mad_reg_req2 { __u8 reserved[3]; }; -#define IB_USER_MAD_REGISTER_AGENT _IOWR(IB_IOCTL_MAGIC, 1, \ - struct ib_user_mad_reg_req) - -#define IB_USER_MAD_UNREGISTER_AGENT _IOW(IB_IOCTL_MAGIC, 2, __u32) - -#define IB_USER_MAD_ENABLE_PKEY _IO(IB_IOCTL_MAGIC, 3) - -#define IB_USER_MAD_REGISTER_AGENT2 _IOWR(IB_IOCTL_MAGIC, 4, \ - struct ib_user_mad_reg_req2) - #endif /* IB_USER_MAD_H */ diff --git a/include/uapi/rdma/rdma_user_ioctl.h b/include/uapi/rdma/rdma_user_ioctl.h index ba1bcdd7178d..820bf3485608 100644 --- a/include/uapi/rdma/rdma_user_ioctl.h +++ b/include/uapi/rdma/rdma_user_ioctl.h @@ -35,9 +35,20 @@ #include <linux/types.h> #include <linux/ioctl.h> +#include <rdma/ib_user_mad.h> /* Documentation/ioctl/ioctl-number.txt */ #define RDMA_IOCTL_MAGIC 0x1b #define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC +#define IB_USER_MAD_REGISTER_AGENT _IOWR(IB_IOCTL_MAGIC, 1, \ + struct ib_user_mad_reg_req) + +#define IB_USER_MAD_UNREGISTER_AGENT _IOW(IB_IOCTL_MAGIC, 2, __u32) + +#define IB_USER_MAD_ENABLE_PKEY _IO(IB_IOCTL_MAGIC, 3) + +#define IB_USER_MAD_REGISTER_AGENT2 _IOWR(IB_IOCTL_MAGIC, 4, \ + struct ib_user_mad_reg_req2) + #endif /* RDMA_USER_IOCTL_H */ |