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

Commit 2cc17736 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'bkl-removal', 'cma', 'ehca', 'for-2.6.27', 'mlx4', 'mthca' and 'nes' into for-linus

parents 2f5de151 1a867c33 1ca8d156 76442640 e8bb4beb 1fa6d818

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -2915,8 +2915,6 @@ P: Faisal Latif 
M:	flatif@neteffect.com

P:	Chien Tung

M:	ctung@neteffect.com

P:	Glenn Streiff

M:	gstreiff@neteffect.com

L:	general@lists.openfabrics.org

W:	http://www.neteffect.com

S:	Supported

drivers/infiniband/core/iwcm.c

+1 −2
Original line number Diff line number Diff line
@@ -942,8 +942,7 @@ static int iwcm_init_qp_init_attr(struct iwcm_id_private *cm_id_priv, 
	case IW_CM_STATE_CONN_RECV:

	case IW_CM_STATE_ESTABLISHED:

		*qp_attr_mask = IB_QP_STATE | IB_QP_ACCESS_FLAGS;

		qp_attr->qp_access_flags = IB_ACCESS_LOCAL_WRITE |

					   IB_ACCESS_REMOTE_WRITE|

		qp_attr->qp_access_flags = IB_ACCESS_REMOTE_WRITE|

					   IB_ACCESS_REMOTE_READ;

		ret = 0;

		break;

drivers/infiniband/core/sa_query.c

+2 −1
Original line number Diff line number Diff line
@@ -1064,6 +1064,7 @@ static void ib_sa_remove_one(struct ib_device *device) 


	for (i = 0; i <= sa_dev->end_port - sa_dev->start_port; ++i) {

		ib_unregister_mad_agent(sa_dev->port[i].agent);

		if (sa_dev->port[i].sm_ah)

			kref_put(&sa_dev->port[i].sm_ah->ref, free_sm_ah);

	}

drivers/infiniband/hw/ehca/ehca_classes.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ struct ehca_qp { 
	u32 packet_count;

	atomic_t nr_events; /* events seen */

	wait_queue_head_t wait_completion;

	int mig_armed;

};



#define IS_SRQ(qp) (qp->ext_type == EQPT_SRQ)

drivers/infiniband/hw/ehca/ehca_hca.c

+3 −1
Original line number Diff line number Diff line
@@ -114,7 +114,9 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props) 
	}



	props->max_pkeys           = 16;

	props->local_ca_ack_delay  = min_t(u8, rblock->local_ca_ack_delay, 255);

	/* Some FW versions say 0 here; insert sensible value in that case */

	props->local_ca_ack_delay  = rblock->local_ca_ack_delay ?

		min_t(u8, rblock->local_ca_ack_delay, 255) : 12;

	props->max_raw_ipv6_qp     = limit_uint(rblock->max_raw_ipv6_qp);

	props->max_raw_ethy_qp     = limit_uint(rblock->max_raw_ethy_qp);

	props->max_mcast_grp       = limit_uint(rblock->max_mcast_grp);