From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Sat, 18 Jun 2016 17:48:07 +0000 (-0700)
Subject: RDS: Remove the link-local restriction as a stop gap measure
X-Git-Tag: v4.1.12-92~135^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=efb09e38551e8b8798511fc3356ad05fc05220d8;p=users%2Fjedix%2Flinux-maple.git

RDS: Remove the link-local restriction as a stop gap measure

Fresh CRS install seems to have a dependency with RDS IB link-local
connection going through. Setting the cluster_interconnect
parameter to non-link local address isn't covering the fresh
install usecases.

So as a stop gap measure, we just warn the user but let the connection
through till we come up with a solution to re-introduce the change.

Orabug: 2360905

Tested-by: Maria Yip <maria.yip@oracle.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
---

diff --git a/net/rds/ib.c b/net/rds/ib.c
index d68ea09c1966..63a2ac02b01b 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -395,10 +395,8 @@ static int rds_ib_laddr_check(struct net *net, __be32 addr)
 	struct sockaddr_in sin;
 
 	/* Link-local addresses don't play well with IB */
-	if (ipv4_is_linklocal_169(addr)) {
+	if (ipv4_is_linklocal_169(addr))
 		pr_info_ratelimited("RDS/IB: Link local address %pI4 NOT SUPPORTED\n", &addr);
-		return -EADDRNOTAVAIL;
-	}
 
 	/* Create a CMA ID and try to bind it. This catches both
 	 * IB and iWARP capable NICs.