Skip to content

Commit 1cf296b

Browse files
Roland DreierLinus Torvalds
authored andcommitted
[PATCH] IB uverbs: update mthca for new API
Update mthca to compile against the updated API for low-level drivers. Signed-off-by: Roland Dreier <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent b5e81bf commit 1cf296b

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

drivers/infiniband/hw/mthca/mthca_provider.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,9 @@ static int mthca_query_gid(struct ib_device *ibdev, u8 port,
284284
return err;
285285
}
286286

287-
static struct ib_pd *mthca_alloc_pd(struct ib_device *ibdev)
287+
static struct ib_pd *mthca_alloc_pd(struct ib_device *ibdev,
288+
struct ib_ucontext *context,
289+
struct ib_udata *udata)
288290
{
289291
struct mthca_pd *pd;
290292
int err;
@@ -338,7 +340,8 @@ static int mthca_ah_destroy(struct ib_ah *ah)
338340
}
339341

340342
static struct ib_qp *mthca_create_qp(struct ib_pd *pd,
341-
struct ib_qp_init_attr *init_attr)
343+
struct ib_qp_init_attr *init_attr,
344+
struct ib_udata *udata)
342345
{
343346
struct mthca_qp *qp;
344347
int err;
@@ -409,7 +412,9 @@ static int mthca_destroy_qp(struct ib_qp *qp)
409412
return 0;
410413
}
411414

412-
static struct ib_cq *mthca_create_cq(struct ib_device *ibdev, int entries)
415+
static struct ib_cq *mthca_create_cq(struct ib_device *ibdev, int entries,
416+
struct ib_ucontext *context,
417+
struct ib_udata *udata)
413418
{
414419
struct mthca_cq *cq;
415420
int nent;
@@ -692,6 +697,8 @@ int mthca_register_device(struct mthca_dev *dev)
692697
int i;
693698

694699
strlcpy(dev->ib_dev.name, "mthca%d", IB_DEVICE_NAME_MAX);
700+
dev->ib_dev.owner = THIS_MODULE;
701+
695702
dev->ib_dev.node_type = IB_NODE_CA;
696703
dev->ib_dev.phys_port_cnt = dev->limits.num_ports;
697704
dev->ib_dev.dma_device = &dev->pdev->dev;

0 commit comments

Comments
 (0)