From: Bang Nguyen <bang.nguyen@oracle.com>
Date: Thu, 15 Aug 2013 02:10:00 +0000 (-0700)
Subject: RDS: RDS reconnect stalls
X-Git-Tag: v4.1.12-92~293^2^2~51
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c2d4ae54ba30a7dd213d287d819409dc7c712f15;p=users%2Fjedix%2Flinux-maple.git

RDS: RDS reconnect stalls

After successfully negiotiating the version at lower protocol, RDS incorrectly
set the proposed version to the higher protocol, causing the subsequent
reconnect to stall.

The fix was not to change the proposed version after the initial connection
setup.

Orabug: 1731355

Signed-off-by: Richard Frank <richard.frank@oracle.com>
(cherry picked from commit 1a14dda0d3d3195306f3a141227eb003e895fb58)
---

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index ccb5d7f1791c2..2982161177f41 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -158,8 +158,6 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn, struct rdma_cm_even
 				RDS_PROTOCOL_MINOR(conn->c_version));
 			rds_conn_destroy(conn);
 			return;
-		} else {
-			conn->c_proposed_version = RDS_PROTOCOL_VERSION;
 		}
 	}