Commit 165e4694 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/srp: Release transport before removing host
  IB/mlx4: Fix value of pkey_index in QP1 completions
  MAINTAINERS: Update Sean Hefty's email address
parents d238998f ad696989

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1919,7 +1919,7 @@ INFINIBAND SUBSYSTEM 
P:	Roland Dreier

M:	rolandd@cisco.com

P:	Sean Hefty

M:	mshefty@ichips.intel.com

M:	sean.hefty@intel.com

P:	Hal Rosenstock

M:	hal.rosenstock@gmail.com 

L:	general@lists.openfabrics.org

drivers/infiniband/hw/mlx4/cq.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq, 
		wc->dlid_path_bits = (be32_to_cpu(cqe->g_mlpath_rqpn) >> 24) & 0x7f;

		wc->wc_flags      |= be32_to_cpu(cqe->g_mlpath_rqpn) & 0x80000000 ?

			IB_WC_GRH : 0;

		wc->pkey_index     = be32_to_cpu(cqe->immed_rss_invalid) >> 16;

		wc->pkey_index     = be32_to_cpu(cqe->immed_rss_invalid) & 0x7f;

	}



	return 0;

drivers/infiniband/ulp/srp/ib_srp.c

+1 −1
Original line number Diff line number Diff line
@@ -2053,8 +2053,8 @@ static void srp_remove_one(struct ib_device *device) 


		list_for_each_entry_safe(target, tmp_target,

					 &host->target_list, list) {

			scsi_remove_host(target->scsi_host);

			srp_remove_host(target->scsi_host);

			scsi_remove_host(target->scsi_host);

			srp_disconnect_target(target);

			ib_destroy_cm_id(target->cm_id);

			srp_free_target_ib(target);