Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents ae2d9293 3e340c05 7bd91299 eadde3a1

drivers/infiniband/core/cm.c

+1 −1
Original line number Diff line number Diff line
@@ -3693,7 +3693,7 @@ static void cm_add_one(struct ib_device *ib_device) 
	cm_dev->device = device_create(&cm_class, &ib_device->dev,

				       MKDEV(0, 0), NULL,

				       "%s", ib_device->name);

	if (!cm_dev->device) {

	if (IS_ERR(cm_dev->device)) {

		kfree(cm_dev);

		return;

	}

drivers/infiniband/hw/mlx4/mr.c

+1 −1
Original line number Diff line number Diff line
@@ -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->ibfrpl.page_list)

	if (!mfrpl->mapped_page_list)

		goto err_free;



	WARN_ON(mfrpl->map & 0x3f);

drivers/infiniband/hw/nes/nes_verbs.c

+4 −5
Original line number Diff line number Diff line
@@ -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;