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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 940c0ff03f3fa420df7c9ad3468212d9f0207e1d..cc77b9ab9d526f96e53bee5f811d9a3f6fc049c0 100644 (file)
--- 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 bd9d132f11c7c48c6134ac13ccf7662c93cdd53c..e7430c9254d3812b0ec8d08c110337058bd270c9 100644 (file)
--- 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 492e144ebe90f11f2bfd9273ac250b9e446bfe5f..ec32a8baf600e1015af4668b18202b146538185e 100644 (file)
--- 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 529c421bb15caf74e5d7c33072e1b2a18e80b96b..6eb3734394a2a5334aba73c139d9c64589c086a2 100644 (file)
--- 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 */