diff options
| author | Leon Romanovsky <leon@kernel.org> | 2016-09-22 17:31:16 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-10-07 16:54:37 -0400 |
| commit | c546b2a3b6612a9fa09940a13844ef384683db6e (patch) | |
| tree | be810fffa3d9b3271b2287ff0c5facae2515f2a2 | |
| parent | a7fe7380f6b234f207a599c9ffbaae6c1a574634 (diff) | |
| download | linux-futex-c546b2a3b6612a9fa09940a13844ef384683db6e.tar.gz | |
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 940c0ff03f3fa4..cc77b9ab9d526f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8086,6 +8086,7 @@ L: linux-rdma@vger.kernel.org W: http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm S: Supported F: drivers/infiniband/hw/nes/ +F: include/uapi/rdma/nes-abi.h NETEM NETWORK EMULATOR M: Stephen Hemminger <stephen@networkplumber.org> diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h index bd9d132f11c7c4..e7430c9254d381 100644 --- a/drivers/infiniband/hw/nes/nes.h +++ b/drivers/infiniband/hw/nes/nes.h @@ -165,7 +165,7 @@ do { \ #include "nes_hw.h" #include "nes_verbs.h" #include "nes_context.h" -#include "nes_user.h" +#include <rdma/nes-abi.h> #include "nes_cm.h" #include "nes_mgt.h" diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild index 492e144ebe90f1..ec32a8baf600e1 100644 --- a/include/uapi/rdma/Kbuild +++ b/include/uapi/rdma/Kbuild @@ -11,4 +11,5 @@ header-y += cxgb3-abi.h header-y += cxgb4-abi.h header-y += mlx4-abi.h header-y += mlx5-abi.h +header-y += nes-abi.h header-y += ocrdma-abi.h diff --git a/drivers/infiniband/hw/nes/nes_user.h b/include/uapi/rdma/nes-abi.h index 529c421bb15caf..6eb3734394a2a5 100644 --- a/drivers/infiniband/hw/nes/nes_user.h +++ b/include/uapi/rdma/nes-abi.h @@ -34,8 +34,8 @@ * */ -#ifndef NES_USER_H -#define NES_USER_H +#ifndef NES_ABI_USER_H +#define NES_ABI_USER_H #include <linux/types.h> @@ -111,4 +111,4 @@ struct nes_create_qp_resp { __u32 nes_drv_opt; }; -#endif /* NES_USER_H */ +#endif /* NES_ABI_USER_H */ |