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

Commit 93fdf10d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/core: Set alternate port number when initializing QP attributes
  IB/uverbs: Set correct user handle for user SRQs
parents 22a3e233 0d8fdfd7

drivers/infiniband/core/cm.c

+1 −0
Original line number Diff line number Diff line
@@ -3152,6 +3152,7 @@ static int cm_init_qp_rtr_attr(struct cm_id_private *cm_id_priv, 
		}

		if (cm_id_priv->alt_av.ah_attr.dlid) {

			*qp_attr_mask |= IB_QP_ALT_PATH;

			qp_attr->alt_port_num = cm_id_priv->alt_av.port->port_num;

			qp_attr->alt_ah_attr = cm_id_priv->alt_av.ah_attr;

		}

		ret = 0;

drivers/infiniband/core/uverbs_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -1963,7 +1963,7 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file, 
	if (!obj)

		return -ENOMEM;



	init_uobj(&obj->uobject, 0, file->ucontext);

	init_uobj(&obj->uobject, cmd.user_handle, file->ucontext);

	down_write(&obj->uobject.mutex);



	pd  = idr_read_pd(cmd.pd_handle, file->ucontext);