diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 20:40:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 20:40:37 -0700 |
| commit | 6db602d447fb6c3aeb020c5dff5219de317f8bb4 (patch) | |
| tree | 379cfdff0c1f6eb66edfbc6a50dfde281602ca13 /drivers/infiniband/hw/ehca/ehca_hca.c | |
| parent | e89a5a43b95cdc4305b7c8e8121a380f02476636 (diff) | |
| parent | 5ff70cac3e98af64f9a1eaec9e762ff4927c26d1 (diff) | |
| download | blackbird-obmc-linux-6db602d447fb6c3aeb020c5dff5219de317f8bb4.tar.gz blackbird-obmc-linux-6db602d447fb6c3aeb020c5dff5219de317f8bb4.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/ehca: SRQ fixes to enable IPoIB CM
IB/ehca: Fix Small QP regressions
Diffstat (limited to 'drivers/infiniband/hw/ehca/ehca_hca.c')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ehca_hca.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c b/drivers/infiniband/hw/ehca/ehca_hca.c index fc19ef9fd963..cf22472d9414 100644 --- a/drivers/infiniband/hw/ehca/ehca_hca.c +++ b/drivers/infiniband/hw/ehca/ehca_hca.c @@ -93,9 +93,13 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props) props->max_pd = min_t(int, rblock->max_pd, INT_MAX); props->max_ah = min_t(int, rblock->max_ah, INT_MAX); props->max_fmr = min_t(int, rblock->max_mr, INT_MAX); - props->max_srq = 0; - props->max_srq_wr = 0; - props->max_srq_sge = 0; + + if (EHCA_BMASK_GET(HCA_CAP_SRQ, shca->hca_cap)) { + props->max_srq = props->max_qp; + props->max_srq_wr = props->max_qp_wr; + props->max_srq_sge = 3; + } + props->max_pkeys = 16; props->local_ca_ack_delay = rblock->local_ca_ack_delay; |
