diff options
author | Leon Romanovsky <leon@kernel.org> | 2016-09-22 10:31:16 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2016-10-07 16:54:37 -0400 |
commit | c546b2a3b6612a9fa09940a13844ef384683db6e (patch) | |
tree | be810fffa3d9b3271b2287ff0c5facae2515f2a2 | |
parent | a7fe7380f6b234f207a599c9ffbaae6c1a574634 (diff) |
IB/nes: Move user vendor structures
This patch moves nes vendor's specific structures to
common UAPI folder which will be visible to all consumers.
These structures are used by user-space library driver
(libmlx4) and currently manually copied to that library.
This move will allow cross-compile against these files and
simplify introduction of vendor specific data.
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r-- | MAINTAINERS | 1 | ||||
-rw-r--r-- | drivers/infiniband/hw/nes/nes.h | 2 | ||||
-rw-r--r-- | include/uapi/rdma/Kbuild | 1 | ||||
-rw-r--r-- | include/uapi/rdma/nes-abi.h (renamed from drivers/infiniband/hw/nes/nes_user.h) | 6 |
4 files changed, 6 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 940c0ff03f3f..cc77b9ab9d52 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -8086,6 +8086,7 @@ L: linux-rdma@vger.kernel.org | |||
8086 | W: http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm | 8086 | W: http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm |
8087 | S: Supported | 8087 | S: Supported |
8088 | F: drivers/infiniband/hw/nes/ | 8088 | F: drivers/infiniband/hw/nes/ |
8089 | F: include/uapi/rdma/nes-abi.h | ||
8089 | 8090 | ||
8090 | NETEM NETWORK EMULATOR | 8091 | NETEM NETWORK EMULATOR |
8091 | M: Stephen Hemminger <stephen@networkplumber.org> | 8092 | M: Stephen Hemminger <stephen@networkplumber.org> |
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h index bd9d132f11c7..e7430c9254d3 100644 --- a/drivers/infiniband/hw/nes/nes.h +++ b/drivers/infiniband/hw/nes/nes.h | |||
@@ -165,7 +165,7 @@ do { \ | |||
165 | #include "nes_hw.h" | 165 | #include "nes_hw.h" |
166 | #include "nes_verbs.h" | 166 | #include "nes_verbs.h" |
167 | #include "nes_context.h" | 167 | #include "nes_context.h" |
168 | #include "nes_user.h" | 168 | #include <rdma/nes-abi.h> |
169 | #include "nes_cm.h" | 169 | #include "nes_cm.h" |
170 | #include "nes_mgt.h" | 170 | #include "nes_mgt.h" |
171 | 171 | ||
diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild index 492e144ebe90..ec32a8baf600 100644 --- a/include/uapi/rdma/Kbuild +++ b/include/uapi/rdma/Kbuild | |||
@@ -11,4 +11,5 @@ header-y += cxgb3-abi.h | |||
11 | header-y += cxgb4-abi.h | 11 | header-y += cxgb4-abi.h |
12 | header-y += mlx4-abi.h | 12 | header-y += mlx4-abi.h |
13 | header-y += mlx5-abi.h | 13 | header-y += mlx5-abi.h |
14 | header-y += nes-abi.h | ||
14 | header-y += ocrdma-abi.h | 15 | header-y += ocrdma-abi.h |
diff --git a/drivers/infiniband/hw/nes/nes_user.h b/include/uapi/rdma/nes-abi.h index 529c421bb15c..6eb3734394a2 100644 --- a/drivers/infiniband/hw/nes/nes_user.h +++ b/include/uapi/rdma/nes-abi.h | |||
@@ -34,8 +34,8 @@ | |||
34 | * | 34 | * |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #ifndef NES_USER_H | 37 | #ifndef NES_ABI_USER_H |
38 | #define NES_USER_H | 38 | #define NES_ABI_USER_H |
39 | 39 | ||
40 | #include <linux/types.h> | 40 | #include <linux/types.h> |
41 | 41 | ||
@@ -111,4 +111,4 @@ struct nes_create_qp_resp { | |||
111 | __u32 nes_drv_opt; | 111 | __u32 nes_drv_opt; |
112 | }; | 112 | }; |
113 | 113 | ||
114 | #endif /* NES_USER_H */ | 114 | #endif /* NES_ABI_USER_H */ |