tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
RDMA/core: Rename RDMA magic number
Rename RDMA magic number to better describe IOCTLs.
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>
authored by
Leon Romanovsky
and committed by
Doug Ledford
10b31e79
8edec0b5
+18
-17
+18
-17
include/uapi/rdma/rdma_user_ioctl.h
+18
-17
include/uapi/rdma/rdma_user_ioctl.h
···
40
40
41
41
/* Documentation/ioctl/ioctl-number.txt */
42
42
#define RDMA_IOCTL_MAGIC 0x1b
43
+
/* Legacy name, for user space application which already use it */
43
44
#define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC
44
45
45
-
#define IB_USER_MAD_REGISTER_AGENT _IOWR(IB_IOCTL_MAGIC, 1, \
46
+
#define IB_USER_MAD_REGISTER_AGENT _IOWR(RDMA_IOCTL_MAGIC, 1, \
46
47
struct ib_user_mad_reg_req)
47
48
48
-
#define IB_USER_MAD_UNREGISTER_AGENT _IOW(IB_IOCTL_MAGIC, 2, __u32)
49
+
#define IB_USER_MAD_UNREGISTER_AGENT _IOW(RDMA_IOCTL_MAGIC, 2, __u32)
49
50
50
-
#define IB_USER_MAD_ENABLE_PKEY _IO(IB_IOCTL_MAGIC, 3)
51
+
#define IB_USER_MAD_ENABLE_PKEY _IO(RDMA_IOCTL_MAGIC, 3)
51
52
52
-
#define IB_USER_MAD_REGISTER_AGENT2 _IOWR(IB_IOCTL_MAGIC, 4, \
53
+
#define IB_USER_MAD_REGISTER_AGENT2 _IOWR(RDMA_IOCTL_MAGIC, 4, \
53
54
struct ib_user_mad_reg_req2)
54
55
55
56
/* User commands. */
···
80
79
#define __NUM(cmd) (HFI1_CMD_##cmd + 0xe0)
81
80
82
81
#define HFI1_IOCTL_ASSIGN_CTXT \
83
-
_IOWR(IB_IOCTL_MAGIC, __NUM(ASSIGN_CTXT), struct hfi1_user_info)
82
+
_IOWR(RDMA_IOCTL_MAGIC, __NUM(ASSIGN_CTXT), struct hfi1_user_info)
84
83
#define HFI1_IOCTL_CTXT_INFO \
85
-
_IOW(IB_IOCTL_MAGIC, __NUM(CTXT_INFO), struct hfi1_ctxt_info)
84
+
_IOW(RDMA_IOCTL_MAGIC, __NUM(CTXT_INFO), struct hfi1_ctxt_info)
86
85
#define HFI1_IOCTL_USER_INFO \
87
-
_IOW(IB_IOCTL_MAGIC, __NUM(USER_INFO), struct hfi1_base_info)
86
+
_IOW(RDMA_IOCTL_MAGIC, __NUM(USER_INFO), struct hfi1_base_info)
88
87
#define HFI1_IOCTL_TID_UPDATE \
89
-
_IOWR(IB_IOCTL_MAGIC, __NUM(TID_UPDATE), struct hfi1_tid_info)
88
+
_IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_UPDATE), struct hfi1_tid_info)
90
89
#define HFI1_IOCTL_TID_FREE \
91
-
_IOWR(IB_IOCTL_MAGIC, __NUM(TID_FREE), struct hfi1_tid_info)
90
+
_IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_FREE), struct hfi1_tid_info)
92
91
#define HFI1_IOCTL_CREDIT_UPD \
93
-
_IO(IB_IOCTL_MAGIC, __NUM(CREDIT_UPD))
92
+
_IO(RDMA_IOCTL_MAGIC, __NUM(CREDIT_UPD))
94
93
#define HFI1_IOCTL_RECV_CTRL \
95
-
_IOW(IB_IOCTL_MAGIC, __NUM(RECV_CTRL), int)
94
+
_IOW(RDMA_IOCTL_MAGIC, __NUM(RECV_CTRL), int)
96
95
#define HFI1_IOCTL_POLL_TYPE \
97
-
_IOW(IB_IOCTL_MAGIC, __NUM(POLL_TYPE), int)
96
+
_IOW(RDMA_IOCTL_MAGIC, __NUM(POLL_TYPE), int)
98
97
#define HFI1_IOCTL_ACK_EVENT \
99
-
_IOW(IB_IOCTL_MAGIC, __NUM(ACK_EVENT), unsigned long)
98
+
_IOW(RDMA_IOCTL_MAGIC, __NUM(ACK_EVENT), unsigned long)
100
99
#define HFI1_IOCTL_SET_PKEY \
101
-
_IOW(IB_IOCTL_MAGIC, __NUM(SET_PKEY), __u16)
100
+
_IOW(RDMA_IOCTL_MAGIC, __NUM(SET_PKEY), __u16)
102
101
#define HFI1_IOCTL_CTXT_RESET \
103
-
_IO(IB_IOCTL_MAGIC, __NUM(CTXT_RESET))
102
+
_IO(RDMA_IOCTL_MAGIC, __NUM(CTXT_RESET))
104
103
#define HFI1_IOCTL_TID_INVAL_READ \
105
-
_IOWR(IB_IOCTL_MAGIC, __NUM(TID_INVAL_READ), struct hfi1_tid_info)
104
+
_IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_INVAL_READ), struct hfi1_tid_info)
106
105
#define HFI1_IOCTL_GET_VERS \
107
-
_IOR(IB_IOCTL_MAGIC, __NUM(GET_VERS), int)
106
+
_IOR(RDMA_IOCTL_MAGIC, __NUM(GET_VERS), int)
108
107
109
108
#endif /* RDMA_USER_IOCTL_H */