diff options
| author | Leon Romanovsky <leon@kernel.org> | 2016-09-22 17:31:13 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-10-07 16:54:35 -0400 |
| commit | e44ee2fd9845a86b0c7e8742672ae5ba6d7d34ee (patch) | |
| tree | a99fb7538c6a5749e6fdb1cdc0fc4b5ab17b4476 | |
| parent | a85fb3383340b417132e5731f9694840660887cb (diff) | |
IB/cxgb4: Move user vendor structures
This patch moves cxgb4 vendor's specific structures to
common UAPI folder which will be visible to all consumers.
These structures are used by user-space library driver
(libcxgb4) 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>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 | ||||
| -rw-r--r-- | include/uapi/rdma/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/rdma/cxgb4-abi.h (renamed from drivers/infiniband/hw/cxgb4/user.h) | 11 |
4 files changed, 9 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8ebd644becef..22fd3b7f5a31 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3482,6 +3482,7 @@ L: linux-rdma@vger.kernel.org W: http://www.openfabrics.org S: Supported F: drivers/infiniband/hw/cxgb4/ +F: include/uapi/rdma/cxgb4-abi.h CXGB4VF ETHERNET DRIVER (CXGB4VF) M: Casey Leedom <leedom@chelsio.com> diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h index aa47e0ae80bc..f83604b2f82d 100644 --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h @@ -58,7 +58,7 @@ #include "cxgb4.h" #include "cxgb4_uld.h" #include "l2t.h" -#include "user.h" +#include <rdma/cxgb4-abi.h> #define DRV_NAME "iw_cxgb4" #define MOD DRV_NAME ":" diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild index 681d7189a01a..59b2c9b34423 100644 --- a/include/uapi/rdma/Kbuild +++ b/include/uapi/rdma/Kbuild @@ -8,4 +8,5 @@ header-y += rdma_user_cm.h header-y += hfi/ header-y += rdma_user_rxe.h header-y += cxgb3-abi.h +header-y += cxgb4-abi.h header-y += mlx5-abi.h diff --git a/drivers/infiniband/hw/cxgb4/user.h b/include/uapi/rdma/cxgb4-abi.h index 295f422b9a3a..472b15990894 100644 --- a/drivers/infiniband/hw/cxgb4/user.h +++ b/include/uapi/rdma/cxgb4-abi.h @@ -29,8 +29,10 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef __C4IW_USER_H__ -#define __C4IW_USER_H__ +#ifndef CXGB4_ABI_USER_H +#define CXGB4_ABI_USER_H + +#include <linux/types.h> #define C4IW_UVERBS_ABI_VERSION 3 @@ -51,9 +53,8 @@ struct c4iw_create_cq_resp { __u32 reserved; /* explicit padding (optional for i386) */ }; - enum { - C4IW_QPF_ONCHIP = (1<<0) + C4IW_QPF_ONCHIP = (1 << 0) }; struct c4iw_create_qp_resp { @@ -77,4 +78,4 @@ struct c4iw_alloc_ucontext_resp { __u32 status_page_size; __u32 reserved; /* explicit padding (optional for i386) */ }; -#endif +#endif /* CXGB4_ABI_USER_H */ |