Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4276
b: refs/heads/master
c: 1cf296b
h: refs/heads/master
v: v3
  • Loading branch information
Roland Dreier authored and Linus Torvalds committed Jul 8, 2005
1 parent 0a65e34 commit c641086
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b5e81bf5e7084796d93167f438ec073e59aca9ed
refs/heads/master: 1cf296b66afeec2edc39cc7bbedbf3d0afd2a373
13 changes: 10 additions & 3 deletions trunk/drivers/infiniband/hw/mthca/mthca_provider.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,9 @@ static int mthca_query_gid(struct ib_device *ibdev, u8 port,
return err;
}

static struct ib_pd *mthca_alloc_pd(struct ib_device *ibdev)
static struct ib_pd *mthca_alloc_pd(struct ib_device *ibdev,
struct ib_ucontext *context,
struct ib_udata *udata)
{
struct mthca_pd *pd;
int err;
Expand Down Expand Up @@ -338,7 +340,8 @@ static int mthca_ah_destroy(struct ib_ah *ah)
}

static struct ib_qp *mthca_create_qp(struct ib_pd *pd,
struct ib_qp_init_attr *init_attr)
struct ib_qp_init_attr *init_attr,
struct ib_udata *udata)
{
struct mthca_qp *qp;
int err;
Expand Down Expand Up @@ -409,7 +412,9 @@ static int mthca_destroy_qp(struct ib_qp *qp)
return 0;
}

static struct ib_cq *mthca_create_cq(struct ib_device *ibdev, int entries)
static struct ib_cq *mthca_create_cq(struct ib_device *ibdev, int entries,
struct ib_ucontext *context,
struct ib_udata *udata)
{
struct mthca_cq *cq;
int nent;
Expand Down Expand Up @@ -692,6 +697,8 @@ int mthca_register_device(struct mthca_dev *dev)
int i;

strlcpy(dev->ib_dev.name, "mthca%d", IB_DEVICE_NAME_MAX);
dev->ib_dev.owner = THIS_MODULE;

dev->ib_dev.node_type = IB_NODE_CA;
dev->ib_dev.phys_port_cnt = dev->limits.num_ports;
dev->ib_dev.dma_device = &dev->pdev->dev;
Expand Down

0 comments on commit c641086

Please sign in to comment.