aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/mthca/mthca_provider.c
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-11-11 14:09:06 -0600
committerDave Kleikamp <shaggy@austin.ibm.com>2005-11-11 14:09:06 -0600
commitca869912366f60cb5e0bdd09f65e80ee6816e73c (patch)
treea72913a29495ca078987c09fc0008f47e11b900b /drivers/infiniband/hw/mthca/mthca_provider.c
parentdd8a306ac0c918268bd2ae89da2dea627f6e352d (diff)
parent388f7ef720a982f49925e7b4e96f216f208f8c03 (diff)
downloadkernel_samsung_smdk4412-ca869912366f60cb5e0bdd09f65e80ee6816e73c.tar.gz
kernel_samsung_smdk4412-ca869912366f60cb5e0bdd09f65e80ee6816e73c.tar.bz2
kernel_samsung_smdk4412-ca869912366f60cb5e0bdd09f65e80ee6816e73c.zip
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_provider.c')
-rw-r--r--drivers/infiniband/hw/mthca/mthca_provider.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 6b016666826..4cc7e2846df 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -90,6 +90,7 @@ static int mthca_query_device(struct ib_device *ibdev,
memcpy(&props->node_guid, out_mad->data + 12, 8);
props->max_mr_size = ~0ull;
+ props->page_size_cap = mdev->limits.page_size_cap;
props->max_qp = mdev->limits.num_qps - mdev->limits.reserved_qps;
props->max_qp_wr = mdev->limits.max_wqes;
props->max_sge = mdev->limits.max_sg;
@@ -615,11 +616,11 @@ static struct ib_qp *mthca_create_qp(struct ib_pd *pd,
return ERR_PTR(err);
}
- init_attr->cap.max_inline_data = 0;
init_attr->cap.max_send_wr = qp->sq.max;
init_attr->cap.max_recv_wr = qp->rq.max;
init_attr->cap.max_send_sge = qp->sq.max_gs;
init_attr->cap.max_recv_sge = qp->rq.max_gs;
+ init_attr->cap.max_inline_data = qp->max_inline_data;
return &qp->ibqp;
}