Skip to content

Commit 9ce28a2

Browse files
rleondledford
authored andcommitted
IB/mlx4: Move user vendor structures
This patch moves mlx4 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 <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent e44ee2f commit 9ce28a2

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7801,6 +7801,7 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/
78017801
S: Supported
78027802
F: drivers/net/ethernet/mellanox/mlx4/
78037803
F: include/linux/mlx4/
7804+
F: include/uapi/rdma/mlx4-abi.h
78047805

78057806
MELLANOX MLX4 IB driver
78067807
M: Yishai Hadas <[email protected]>

drivers/infiniband/hw/mlx4/cq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <linux/slab.h>
3838

3939
#include "mlx4_ib.h"
40-
#include "user.h"
40+
#include <rdma/mlx4-abi.h>
4141

4242
static void mlx4_ib_cq_comp(struct mlx4_cq *cq)
4343
{

drivers/infiniband/hw/mlx4/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
#include <linux/mlx4/qp.h>
5656

5757
#include "mlx4_ib.h"
58-
#include "user.h"
58+
#include <rdma/mlx4-abi.h>
5959

6060
#define DRV_NAME MLX4_IB_DRV_NAME
6161
#define DRV_VERSION "2.2-1"

drivers/infiniband/hw/mlx4/qp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#include <linux/mlx4/qp.h>
4848

4949
#include "mlx4_ib.h"
50-
#include "user.h"
50+
#include <rdma/mlx4-abi.h>
5151

5252
static void mlx4_ib_lock_cqs(struct mlx4_ib_cq *send_cq,
5353
struct mlx4_ib_cq *recv_cq);

drivers/infiniband/hw/mlx4/srq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <linux/vmalloc.h>
3838

3939
#include "mlx4_ib.h"
40-
#include "user.h"
40+
#include <rdma/mlx4-abi.h>
4141

4242
static void *get_wqe(struct mlx4_ib_srq *srq, int n)
4343
{

include/uapi/rdma/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ header-y += hfi/
99
header-y += rdma_user_rxe.h
1010
header-y += cxgb3-abi.h
1111
header-y += cxgb4-abi.h
12+
header-y += mlx4-abi.h
1213
header-y += mlx5-abi.h

drivers/infiniband/hw/mlx4/user.h renamed to include/uapi/rdma/mlx4-abi.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
* SOFTWARE.
3232
*/
3333

34-
#ifndef MLX4_IB_USER_H
35-
#define MLX4_IB_USER_H
34+
#ifndef MLX4_ABI_USER_H
35+
#define MLX4_ABI_USER_H
3636

3737
#include <linux/types.h>
3838

@@ -104,4 +104,4 @@ struct mlx4_ib_create_qp {
104104
__u8 reserved[5];
105105
};
106106

107-
#endif /* MLX4_IB_USER_H */
107+
#endif /* MLX4_ABI_USER_H */

0 commit comments

Comments
 (0)