From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Oct 2014 19:29:23 +0000 (-0700)
Subject: Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: MMI-PSA29.97-13-9~11305
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2eb7f910c158fd675ab33aff67904512779996e8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'rdma-for-linus' of git://git./linux/kernel/git/roland/infiniband

Pull infiniband/RDMA updates from Roland Dreier:
 - large set of iSER initiator improvements
 - hardware driver fixes for cxgb4, mlx5 and ocrdma
 - small fixes to core midlayer

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (47 commits)
  RDMA/cxgb4: Fix ntuple calculation for ipv6 and remove duplicate line
  RDMA/cxgb4: Add missing neigh_release in find_route
  RDMA/cxgb4: Take IPv6 into account for best_mtu and set_emss
  RDMA/cxgb4: Make c4iw_wr_log_size_order static
  IB/core: Fix XRC race condition in ib_uverbs_open_qp
  IB/core: Clear AH attr variable to prevent garbage data
  RDMA/ocrdma: Save the bit environment, spare unncessary parenthesis
  RDMA/ocrdma: The kernel has a perfectly good BIT() macro - use it
  RDMA/ocrdma: Don't memset() buffers we just allocated with kzalloc()
  RDMA/ocrdma: Remove a unused-label warning
  RDMA/ocrdma: Convert kernel VA to PA for mmap in user
  RDMA/ocrdma: Get vlan tag from ib_qp_attrs
  RDMA/ocrdma: Add default GID at index 0
  IB/mlx5, iser, isert: Add Signature API additions
  Target/iser: Centralize ib_sig_domain setting
  IB/iser: Centralize ib_sig_domain settings
  IB/mlx5: Use extended internal signature layout
  IB/iser: Set IP_CSUM as default guard type
  IB/iser: Remove redundant assignment
  IB/mlx5: Use enumerations for PI copy mask
  ...
---

2eb7f910c158fd675ab33aff67904512779996e8
diff --cc drivers/infiniband/hw/mlx5/qp.c
index dbfe498870c1,f1b49e024664..e261a53f9a02
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@@ -1317,6 -1302,11 +1317,11 @@@ static int mlx5_set_path(struct mlx5_ib
  	path->rlid	= cpu_to_be16(ah->dlid);
  
  	if (ah->ah_flags & IB_AH_GRH) {
 -		if (ah->grh.sgid_index >= dev->mdev->caps.port[port - 1].gid_table_len) {
++		if (ah->grh.sgid_index >= gen->port[port - 1].gid_table_len) {
+ 			pr_err(KERN_ERR "sgid_index (%u) too large. max is %d\n",
 -			       ah->grh.sgid_index, dev->mdev->caps.port[port - 1].gid_table_len);
++			       ah->grh.sgid_index, gen->port[port - 1].gid_table_len);
+ 			return -EINVAL;
+ 		}
  		path->grh_mlid |= 1 << 7;
  		path->mgid_index = ah->grh.sgid_index;
  		path->hop_limit  = ah->grh.hop_limit;