From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Sep 2013 16:39:27 +0000 (-0700)
Subject: Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v3.12-rc1~139
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=7c049d086941a74c1babac6dc6901b88e1ce5b7e;p=~andy%2Flinux

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

Pull main batch of InfiniBand/RDMA changes from Roland Dreier:
 - Large ocrdma HW driver update: add "fast register" work requests,
   fixes, cleanups
 - Add receive flow steering support for raw QPs
 - Fix IPoIB neighbour race that leads to crash
 - iSER updates including support for using "fast register" memory
   registration
 - IPv6 support for iWARP
 - XRC transport fixes

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (54 commits)
  RDMA/ocrdma: Fix compiler warning about int/pointer size mismatch
  IB/iser: Fix redundant pointer check in dealloc flow
  IB/iser: Fix possible memory leak in iser_create_frwr_pool()
  IB/qib: Move COUNTER_MASK definition within qib_mad.h header guards
  RDMA/ocrdma: Fix passing wrong opcode to modify_srq
  RDMA/ocrdma: Fill PVID in UMC case
  RDMA/ocrdma: Add ABI versioning support
  RDMA/ocrdma: Consider multiple SGES in case of DPP
  RDMA/ocrdma: Fix for displaying proper link speed
  RDMA/ocrdma: Increase STAG array size
  RDMA/ocrdma: Dont use PD 0 for userpace CQ DB
  RDMA/ocrdma: FRMA code cleanup
  RDMA/ocrdma: For ERX2 irrespective of Qid, num_posted offset is 24
  RDMA/ocrdma: Fix to work with even a single MSI-X vector
  RDMA/ocrdma: Remove the MTU check based on Ethernet MTU
  RDMA/ocrdma: Add support for fast register work requests (FRWR)
  RDMA/ocrdma: Create IRD queue fix
  IB/core: Better checking of userspace values for receive flow steering
  IB/mlx4: Add receive flow steering support
  IB/core: Export ib_create/destroy_flow through uverbs
  ...
---

7c049d086941a74c1babac6dc6901b88e1ce5b7e
diff --cc drivers/infiniband/ulp/iser/iser_initiator.c
index b31fa1d954a,5f01da99ad6..538822684d5
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@@ -249,15 -342,10 +343,16 @@@ static int iser_post_rx_bufs(struct isc
  	WARN_ON(iser_conn->ib_conn->post_recv_buf_count != 1);
  	WARN_ON(atomic_read(&iser_conn->ib_conn->post_send_buf_count) != 0);
  
 -	iser_dbg("Initially post: %d\n", iser_conn->ib_conn->min_posted_rx);
 +	if (session->discovery_sess) {
 +		iser_info("Discovery session, re-using login RX buffer\n");
 +		return 0;
 +	} else
 +		iser_info("Normal session, posting batch of RX %d buffers\n",
- 			  ISER_MIN_POSTED_RX);
++			  iser_conn->ib_conn->min_posted_rx);
 +
  	/* Initial post receive buffers */
- 	if (iser_post_recvm(iser_conn->ib_conn, ISER_MIN_POSTED_RX))
+ 	if (iser_post_recvm(iser_conn->ib_conn,
+ 			    iser_conn->ib_conn->min_posted_rx))
  		return -ENOMEM;
  
  	return 0;