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

Commit f36ae342 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cma', 'ipath', 'misc', 'mlx4', 'nes' and 'qib' into for-next

parents 9ced69ca ef535287 e47e321a a6f7feae c5488c57 b6bfefb0

drivers/infiniband/core/uverbs_cmd.c

+1 −0
Original line number Diff line number Diff line
@@ -1485,6 +1485,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, 
		qp->event_handler = attr.event_handler;

		qp->qp_context	  = attr.qp_context;

		qp->qp_type	  = attr.qp_type;

		atomic_set(&qp->usecnt, 0);

		atomic_inc(&pd->usecnt);

		atomic_inc(&attr.send_cq->usecnt);

		if (attr.recv_cq)

drivers/infiniband/core/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, 
		qp->uobject    = NULL;

		qp->qp_type    = qp_init_attr->qp_type;



		atomic_set(&qp->usecnt, 0);

		if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) {

			qp->event_handler = __ib_shared_qp_event_handler;

			qp->qp_context = qp;
@@ -430,7 +431,6 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, 
			qp->xrcd = qp_init_attr->xrcd;

			atomic_inc(&qp_init_attr->xrcd->usecnt);

			INIT_LIST_HEAD(&qp->open_list);

			atomic_set(&qp->usecnt, 0);



			real_qp = qp;

			qp = __ib_open_qp(real_qp, qp_init_attr->event_handler,

drivers/infiniband/hw/ipath/ipath_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int create_file(const char *name, umode_t mode, 
		error = ipathfs_mknod(parent->d_inode, *dentry,

				      mode, fops, data);

	else

		error = PTR_ERR(dentry);

		error = PTR_ERR(*dentry);

	mutex_unlock(&parent->d_inode->i_mutex);



	return error;

drivers/infiniband/hw/mlx4/mad.c

+2 −5
Original line number Diff line number Diff line
@@ -257,12 +257,9 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 
			return IB_MAD_RESULT_SUCCESS;



		/*

		 * Don't process SMInfo queries or vendor-specific

		 * MADs -- the SMA can't handle them.

		 * Don't process SMInfo queries -- the SMA can't handle them.

		 */

		if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO ||

		    ((in_mad->mad_hdr.attr_id & IB_SMP_ATTR_VENDOR_MASK) ==

		     IB_SMP_ATTR_VENDOR_MASK))

		if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO)

			return IB_MAD_RESULT_SUCCESS;

	} else if (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_PERF_MGMT ||

		   in_mad->mad_hdr.mgmt_class == MLX4_IB_VENDOR_CLASS1   ||

drivers/infiniband/hw/nes/nes.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.

 * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.

 * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.

 *

 * This software is available to you under a choice of one of two