History

RDMA/core: Rename RDMA magic number

Rename RDMA magic number to better describe IOCTLs.

Leon Romanovsky committed 10 years ago

Commit 10b31e71 parent 8edec0b1 file · +18 −17Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/rdma/rdma_user_ioctl.h+18−17
@@ -40,16 +40,17 @@ · 39 unmodified lines
4040
4141 /* Documentation/ioctl/ioctl-number.txt */
4242 #define RDMA_IOCTL_MAGIC 0x1b
43+/* Legacy name, for user space application which already use it */
4344 #define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC
4445
45−#define IB_USER_MAD_REGISTER_AGENT _IOWR(IB_IOCTL_MAGIC, 1, \
46+#define IB_USER_MAD_REGISTER_AGENT _IOWR(RDMA_IOCTL_MAGIC, 1, \
4647 struct ib_user_mad_reg_req)
4748
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)
4950
50−#define IB_USER_MAD_ENABLE_PKEY _IO(IB_IOCTL_MAGIC, 3)
51+#define IB_USER_MAD_ENABLE_PKEY _IO(RDMA_IOCTL_MAGIC, 3)
5152
52−#define IB_USER_MAD_REGISTER_AGENT2 _IOWR(IB_IOCTL_MAGIC, 4, \
53+#define IB_USER_MAD_REGISTER_AGENT2 _IOWR(RDMA_IOCTL_MAGIC, 4, \
5354 struct ib_user_mad_reg_req2)
5455
5556 /* User commands. */
@@ -79,30 +80,30 @@ · 23 unmodified lines
7980 #define __NUM(cmd) (HFI1_CMD_##cmd + 0xe0)
8081
8182 #define HFI1_IOCTL_ASSIGN_CTXT \
82− _IOWR(IB_IOCTL_MAGIC, __NUM(ASSIGN_CTXT), struct hfi1_user_info)
83+ _IOWR(RDMA_IOCTL_MAGIC, __NUM(ASSIGN_CTXT), struct hfi1_user_info)
8384 #define HFI1_IOCTL_CTXT_INFO \
84− _IOW(IB_IOCTL_MAGIC, __NUM(CTXT_INFO), struct hfi1_ctxt_info)
85+ _IOW(RDMA_IOCTL_MAGIC, __NUM(CTXT_INFO), struct hfi1_ctxt_info)
8586 #define HFI1_IOCTL_USER_INFO \
86− _IOW(IB_IOCTL_MAGIC, __NUM(USER_INFO), struct hfi1_base_info)
87+ _IOW(RDMA_IOCTL_MAGIC, __NUM(USER_INFO), struct hfi1_base_info)
8788 #define HFI1_IOCTL_TID_UPDATE \
88− _IOWR(IB_IOCTL_MAGIC, __NUM(TID_UPDATE), struct hfi1_tid_info)
89+ _IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_UPDATE), struct hfi1_tid_info)
8990 #define HFI1_IOCTL_TID_FREE \
90− _IOWR(IB_IOCTL_MAGIC, __NUM(TID_FREE), struct hfi1_tid_info)
91+ _IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_FREE), struct hfi1_tid_info)
9192 #define HFI1_IOCTL_CREDIT_UPD \
92− _IO(IB_IOCTL_MAGIC, __NUM(CREDIT_UPD))
93+ _IO(RDMA_IOCTL_MAGIC, __NUM(CREDIT_UPD))
9394 #define HFI1_IOCTL_RECV_CTRL \
94− _IOW(IB_IOCTL_MAGIC, __NUM(RECV_CTRL), int)
95+ _IOW(RDMA_IOCTL_MAGIC, __NUM(RECV_CTRL), int)
9596 #define HFI1_IOCTL_POLL_TYPE \
96− _IOW(IB_IOCTL_MAGIC, __NUM(POLL_TYPE), int)
97+ _IOW(RDMA_IOCTL_MAGIC, __NUM(POLL_TYPE), int)
9798 #define HFI1_IOCTL_ACK_EVENT \
98− _IOW(IB_IOCTL_MAGIC, __NUM(ACK_EVENT), unsigned long)
99+ _IOW(RDMA_IOCTL_MAGIC, __NUM(ACK_EVENT), unsigned long)
99100 #define HFI1_IOCTL_SET_PKEY \
100− _IOW(IB_IOCTL_MAGIC, __NUM(SET_PKEY), __u16)
101+ _IOW(RDMA_IOCTL_MAGIC, __NUM(SET_PKEY), __u16)
101102 #define HFI1_IOCTL_CTXT_RESET \
102− _IO(IB_IOCTL_MAGIC, __NUM(CTXT_RESET))
103+ _IO(RDMA_IOCTL_MAGIC, __NUM(CTXT_RESET))
103104 #define HFI1_IOCTL_TID_INVAL_READ \
104− _IOWR(IB_IOCTL_MAGIC, __NUM(TID_INVAL_READ), struct hfi1_tid_info)
105+ _IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_INVAL_READ), struct hfi1_tid_info)
105106 #define HFI1_IOCTL_GET_VERS \
106− _IOR(IB_IOCTL_MAGIC, __NUM(GET_VERS), int)
107+ _IOR(RDMA_IOCTL_MAGIC, __NUM(GET_VERS), int)
107108
108109 #endif /* RDMA_USER_IOCTL_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t