From c546b2a3b6612a9fa09940a13844ef384683db6e Mon Sep 17 00:00:00 2001 From: Leon Romanovsky Date: Thu, 22 Sep 2016 17:31:16 +0300 Subject: [PATCH] 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 Signed-off-by: Doug Ledford --- MAINTAINERS | 1 + drivers/infiniband/hw/nes/nes.h | 2 +- include/uapi/rdma/Kbuild | 1 + .../hw/nes/nes_user.h => include/uapi/rdma/nes-abi.h | 6 +++--- 4 files changed, 6 insertions(+), 4 deletions(-) rename drivers/infiniband/hw/nes/nes_user.h => include/uapi/rdma/nes-abi.h (97%) diff --git a/MAINTAINERS b/MAINTAINERS index 940c0ff03f3f..cc77b9ab9d52 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 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 { \ #include "nes_hw.h" #include "nes_verbs.h" #include "nes_context.h" -#include "nes_user.h" +#include #include "nes_cm.h" #include "nes_mgt.h" 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 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 similarity index 97% rename from drivers/infiniband/hw/nes/nes_user.h rename to 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 @@ * */ -#ifndef NES_USER_H -#define NES_USER_H +#ifndef NES_ABI_USER_H +#define NES_ABI_USER_H #include @@ -111,4 +111,4 @@ struct nes_create_qp_resp { __u32 nes_drv_opt; }; -#endif /* NES_USER_H */ +#endif /* NES_ABI_USER_H */ -- 2.30.2