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

Commit 56f2fdaa authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cma', 'cxgb3', 'ehca', 'ipoib', 'mad', 'mlx4' and 'nes' into for-next

parents 6aea938f dc35fac9 263c24a2 83bb63f6 52805174 57893d1c 7b49d954

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2899,9 +2899,9 @@ S: Maintained 


NETEFFECT IWARP RNIC DRIVER (IW_NES)

P:	Faisal Latif

M:	flatif@neteffect.com

M:	faisal.latif@intel.com

P:	Chien Tung

M:	ctung@neteffect.com

M:	chien.tin.tung@intel.com

L:	general@lists.openfabrics.org

W:	http://www.neteffect.com

S:	Supported

drivers/infiniband/core/mad.c

+5 −9
Original line number Diff line number Diff line
@@ -406,19 +406,15 @@ static int register_snoop_agent(struct ib_mad_qp_info *qp_info, 


	if (i == qp_info->snoop_table_size) {

		/* Grow table. */

		new_snoop_table = kmalloc(sizeof mad_snoop_priv *

					  qp_info->snoop_table_size + 1,

		new_snoop_table = krealloc(qp_info->snoop_table,

					   sizeof mad_snoop_priv *

					   (qp_info->snoop_table_size + 1),

					   GFP_ATOMIC);

		if (!new_snoop_table) {

			i = -ENOMEM;

			goto out;

		}

		if (qp_info->snoop_table) {

			memcpy(new_snoop_table, qp_info->snoop_table,

			       sizeof mad_snoop_priv *

			       qp_info->snoop_table_size);

			kfree(qp_info->snoop_table);

		}



		qp_info->snoop_table = new_snoop_table;

		qp_info->snoop_table_size++;

	}

drivers/infiniband/hw/cxgb3/iwch_cm.c

+1 −0
Original line number Diff line number Diff line
@@ -1942,6 +1942,7 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
fail3:

	cxgb3_free_atid(ep->com.tdev, ep->atid);

fail2:

	cm_id->rem_ref(cm_id);

	put_ep(&ep->com);

out:

	return err;

drivers/infiniband/hw/ehca/ehca_classes.h

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ struct ehca_shca { 
	/* MR pgsize: bit 0-3 means 4K, 64K, 1M, 16M respectively */

	u32 hca_cap_mr_pgsize;

	int max_mtu;

	int max_num_qps;

	int max_num_cqs;

	atomic_t num_cqs;

	atomic_t num_qps;

};

drivers/infiniband/hw/ehca/ehca_cq.c

+2 −2
Original line number Diff line number Diff line
@@ -132,9 +132,9 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 
	if (cqe >= 0xFFFFFFFF - 64 - additional_cqe)

		return ERR_PTR(-EINVAL);



	if (!atomic_add_unless(&shca->num_cqs, 1, ehca_max_cq)) {

	if (!atomic_add_unless(&shca->num_cqs, 1, shca->max_num_cqs)) {

		ehca_err(device, "Unable to create CQ, max number of %i "

			"CQs reached.", ehca_max_cq);

			"CQs reached.", shca->max_num_cqs);

		ehca_err(device, "To increase the maximum number of CQs "

			"use the number_of_cqs module parameter.\n");

		return ERR_PTR(-ENOSPC);