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

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
...@@ -1919,7 +1919,7 @@ INFINIBAND SUBSYSTEM ...@@ -1919,7 +1919,7 @@ INFINIBAND SUBSYSTEM
P: Roland Dreier P: Roland Dreier
M: rolandd@cisco.com M: rolandd@cisco.com
P: Sean Hefty P: Sean Hefty
M: mshefty@ichips.intel.com M: sean.hefty@intel.com
P: Hal Rosenstock P: Hal Rosenstock
M: hal.rosenstock@gmail.com M: hal.rosenstock@gmail.com
L: general@lists.openfabrics.org L: general@lists.openfabrics.org
......
...@@ -430,7 +430,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq, ...@@ -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->dlid_path_bits = (be32_to_cpu(cqe->g_mlpath_rqpn) >> 24) & 0x7f;
wc->wc_flags |= be32_to_cpu(cqe->g_mlpath_rqpn) & 0x80000000 ? wc->wc_flags |= be32_to_cpu(cqe->g_mlpath_rqpn) & 0x80000000 ?
IB_WC_GRH : 0; 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; return 0;
......
...@@ -2053,8 +2053,8 @@ static void srp_remove_one(struct ib_device *device) ...@@ -2053,8 +2053,8 @@ static void srp_remove_one(struct ib_device *device)
list_for_each_entry_safe(target, tmp_target, list_for_each_entry_safe(target, tmp_target,
&host->target_list, list) { &host->target_list, list) {
scsi_remove_host(target->scsi_host);
srp_remove_host(target->scsi_host); srp_remove_host(target->scsi_host);
scsi_remove_host(target->scsi_host);
srp_disconnect_target(target); srp_disconnect_target(target);
ib_destroy_cm_id(target->cm_id); ib_destroy_cm_id(target->cm_id);
srp_free_target_ib(target); srp_free_target_ib(target);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment