From b67ed1069b37c27f9431b6e3e1652f0277b65896 Mon Sep 17 00:00:00 2001 From: Chien Tung Date: Thu, 25 Mar 2010 13:39:50 +0000 Subject: [PATCH] --- yaml --- r: 189751 b: refs/heads/master c: eadde3a1a5291492098e8b0b6435d075fc22486b h: refs/heads/master i: 189749: 6e449052634b9b3bda8371a4db25bd8e763b04ac 189747: fb828ad40e6cb532bc25d67b8cee8924f23ed816 189743: eca0cfdfe2cc0e9eedeae4e7718e5f2cc0f6e804 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mlx4/mr.c | 2 +- trunk/drivers/infiniband/hw/nes/nes_verbs.c | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e55d9c3d7d76..ee8c7ba296a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bd912998ec9cdbb0268138b6b51f28adf7865f4 +refs/heads/master: eadde3a1a5291492098e8b0b6435d075fc22486b diff --git a/trunk/drivers/infiniband/hw/mlx4/mr.c b/trunk/drivers/infiniband/hw/mlx4/mr.c index 63ec26f6b0c6..8f3666b20ea4 100644 --- a/trunk/drivers/infiniband/hw/mlx4/mr.c +++ b/trunk/drivers/infiniband/hw/mlx4/mr.c @@ -238,7 +238,7 @@ struct ib_fast_reg_page_list *mlx4_ib_alloc_fast_reg_page_list(struct ib_device mfrpl->mapped_page_list = dma_alloc_coherent(&dev->dev->pdev->dev, size, &mfrpl->map, GFP_KERNEL); - if (!mfrpl->mapped_page_list) + if (!mfrpl->ibfrpl.page_list) goto err_free; WARN_ON(mfrpl->map & 0x3f); diff --git a/trunk/drivers/infiniband/hw/nes/nes_verbs.c b/trunk/drivers/infiniband/hw/nes/nes_verbs.c index 69928296d74b..36348bf9dee2 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_verbs.c +++ b/trunk/drivers/infiniband/hw/nes/nes_verbs.c @@ -2820,11 +2820,10 @@ static int nes_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, attr->cap.max_send_wr = nesqp->hwqp.sq_size; attr->cap.max_recv_wr = nesqp->hwqp.rq_size; attr->cap.max_recv_sge = 1; - if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) { - init_attr->cap.max_inline_data = 0; - } else { - init_attr->cap.max_inline_data = 64; - } + if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) + attr->cap.max_inline_data = 0; + else + attr->cap.max_inline_data = 64; init_attr->event_handler = nesqp->ibqp.event_handler; init_attr->qp_context = nesqp->ibqp.qp_context;