Commit 5091b353 authored by Roland Dreier's avatar Roland Dreier

Merge branches 'cma', 'misc', 'mlx4' and 'nes' into for-linus

...@@ -3693,7 +3693,7 @@ static void cm_add_one(struct ib_device *ib_device) ...@@ -3693,7 +3693,7 @@ static void cm_add_one(struct ib_device *ib_device)
cm_dev->device = device_create(&cm_class, &ib_device->dev, cm_dev->device = device_create(&cm_class, &ib_device->dev,
MKDEV(0, 0), NULL, MKDEV(0, 0), NULL,
"%s", ib_device->name); "%s", ib_device->name);
if (!cm_dev->device) { if (IS_ERR(cm_dev->device)) {
kfree(cm_dev); kfree(cm_dev);
return; return;
} }
......
...@@ -238,7 +238,7 @@ struct ib_fast_reg_page_list *mlx4_ib_alloc_fast_reg_page_list(struct ib_device ...@@ -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, mfrpl->mapped_page_list = dma_alloc_coherent(&dev->dev->pdev->dev,
size, &mfrpl->map, size, &mfrpl->map,
GFP_KERNEL); GFP_KERNEL);
if (!mfrpl->ibfrpl.page_list) if (!mfrpl->mapped_page_list)
goto err_free; goto err_free;
WARN_ON(mfrpl->map & 0x3f); WARN_ON(mfrpl->map & 0x3f);
......
...@@ -2820,11 +2820,10 @@ static int nes_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, ...@@ -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_send_wr = nesqp->hwqp.sq_size;
attr->cap.max_recv_wr = nesqp->hwqp.rq_size; attr->cap.max_recv_wr = nesqp->hwqp.rq_size;
attr->cap.max_recv_sge = 1; attr->cap.max_recv_sge = 1;
if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) { if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA)
init_attr->cap.max_inline_data = 0; attr->cap.max_inline_data = 0;
} else { else
init_attr->cap.max_inline_data = 64; attr->cap.max_inline_data = 64;
}
init_attr->event_handler = nesqp->ibqp.event_handler; init_attr->event_handler = nesqp->ibqp.event_handler;
init_attr->qp_context = nesqp->ibqp.qp_context; init_attr->qp_context = nesqp->ibqp.qp_context;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment