Merge branches 'cxgb3', 'ehca', 'ipath', 'ipoib', 'misc', 'mlx4', 'mthca' and 'nes' into for-linus (45c448a1) · Commits · e / devices / android_kernel_fairphone_FP4

MAINTAINERS

+6 −6

Original line number	Diff line number	Diff line
		@@ -439,7 +439,7 @@ F: drivers/hwmon/ams/
		AMSO1100 RNIC DRIVER
		M: Tom Tucker <tom@opengridcomputing.com>
		M: Steve Wise <swise@opengridcomputing.com>
		L: general@lists.openfabrics.org
		L: linux-rdma@vger.kernel.org
		S: Maintained
		F: drivers/infiniband/hw/amso1100/

		@@ -1494,7 +1494,7 @@ F: drivers/net/cxgb3/

		CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
		M: Steve Wise <swise@chelsio.com>
		L: general@lists.openfabrics.org
		L: linux-rdma@vger.kernel.org
		W: http://www.openfabrics.org
		S: Supported
		F: drivers/infiniband/hw/cxgb3/
		@@ -1868,7 +1868,7 @@ F: fs/efs/
		EHCA (IBM GX bus InfiniBand adapter) DRIVER
		M: Hoang-Nam Nguyen <hnguyen@de.ibm.com>
		M: Christoph Raisch <raisch@de.ibm.com>
		L: general@lists.openfabrics.org
		L: linux-rdma@vger.kernel.org
		S: Supported
		F: drivers/infiniband/hw/ehca/

		@@ -2552,7 +2552,7 @@ INFINIBAND SUBSYSTEM
		M: Roland Dreier <rolandd@cisco.com>
		M: Sean Hefty <sean.hefty@intel.com>
		M: Hal Rosenstock <hal.rosenstock@gmail.com>
		L: general@lists.openfabrics.org (moderated for non-subscribers)
		L: linux-rdma@vger.kernel.org
		W: http://www.openib.org/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
		S: Supported
		@@ -2729,7 +2729,7 @@ F: drivers/net/ipg.c

		IPATH DRIVER
		M: Ralph Campbell <infinipath@qlogic.com>
		L: general@lists.openfabrics.org
		L: linux-rdma@vger.kernel.org
		T: git git://git.qlogic.com/ipath-linux-2.6
		S: Supported
		F: drivers/infiniband/hw/ipath/
		@@ -3485,7 +3485,7 @@ F: drivers/scsi/NCR_D700.*
		NETEFFECT IWARP RNIC DRIVER (IW_NES)
		M: Faisal Latif <faisal.latif@intel.com>
		M: Chien Tung <chien.tin.tung@intel.com>
		L: general@lists.openfabrics.org
		L: linux-rdma@vger.kernel.org
		W: http://www.neteffect.com
		S: Supported
		F: drivers/infiniband/hw/nes/

drivers/infiniband/core/iwcm.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -362,6 +362,7 @@ static void destroy_cm_id(struct iw_cm_id *cm_id)
		* In either case, must tell the provider to reject.
		*/
		cm_id_priv->state = IW_CM_STATE_DESTROYING;
		cm_id->device->iwcm->reject(cm_id, NULL, 0);
		break;
		case IW_CM_STATE_CONN_SENT:
		case IW_CM_STATE_DESTROYING:

drivers/infiniband/core/mad.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -51,8 +51,7 @@ static struct list_head ib_mad_port_list;
		static u32 ib_mad_client_id = 0;

		/* Port list lock */
		static spinlock_t ib_mad_port_list_lock;

		static DEFINE_SPINLOCK(ib_mad_port_list_lock);

		/* Forward declarations */
		static int method_in_use(struct ib_mad_mgmt_method_table **method,
		@@ -2984,8 +2983,6 @@ static int __init ib_mad_init_module(void)
		{
		int ret;

		spin_lock_init(&ib_mad_port_list_lock);

		ib_mad_cache = kmem_cache_create("ib_mad",
		sizeof(struct ib_mad_private),
		0,
		@@ -3021,4 +3018,3 @@ static void __exit ib_mad_cleanup_module(void)

		module_init(ib_mad_init_module);
		module_exit(ib_mad_cleanup_module);

drivers/infiniband/core/multicast.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -106,6 +106,8 @@ struct mcast_group {
		struct ib_sa_query *query;
		int query_id;
		u16 pkey_index;
		u8 leave_state;
		int retries;
		};

		struct mcast_member {
		@@ -350,6 +352,7 @@ static int send_leave(struct mcast_group *group, u8 leave_state)

		rec = group->rec;
		rec.join_state = leave_state;
		group->leave_state = leave_state;

		ret = ib_sa_mcmember_rec_query(&sa_client, port->dev->device,
		port->port_num, IB_SA_METHOD_DELETE, &rec,
		@@ -542,6 +545,10 @@ static void leave_handler(int status, struct ib_sa_mcmember_rec *rec,
		{
		struct mcast_group *group = context;

		if (status && group->retries > 0 &&
		!send_leave(group, group->leave_state))
		group->retries--;
		else
		mcast_work_handler(&group->work);
		}

		@@ -565,6 +572,7 @@ static struct mcast_group acquire_group(struct mcast_port port,
		if (!group)
		return NULL;

		group->retries = 3;
		group->port = port;
		group->rec.mgid = *mgid;
		group->pkey_index = MCAST_INVALID_PKEY_INDEX;

drivers/infiniband/core/sa_query.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -109,10 +109,10 @@ static struct ib_client sa_client = {
		.remove = ib_sa_remove_one
		};

		static spinlock_t idr_lock;
		static DEFINE_SPINLOCK(idr_lock);
		static DEFINE_IDR(query_idr);

		static spinlock_t tid_lock;
		static DEFINE_SPINLOCK(tid_lock);
		static u32 tid;

		#define PATH_REC_FIELD(field) \
		@@ -1077,9 +1077,6 @@ static int __init ib_sa_init(void)
		{
		int ret;

		spin_lock_init(&idr_lock);
		spin_lock_init(&tid_lock);

		get_random_bytes(&tid, sizeof tid);

		ret = ib_register_client(&sa_client);