From d12ee469a8a96545b64f08aeae5c49447cb4144b Mon Sep 17 00:00:00 2001
From: "Marciniszyn, Mike" <mike.marciniszyn@intel.com>
Date: Fri, 21 Dec 2012 08:01:54 +0000
Subject: [PATCH] --- yaml --- r: 348028 b: refs/heads/master c:
 a49675988c127b5b5876c252e5db2ee0410a10c2 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/net/rds/ib_cm.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8adc6d056b88..befec63e4fff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2e9bd70327d788011cf787a51ceba5925bbc63a
+refs/heads/master: a49675988c127b5b5876c252e5db2ee0410a10c2
diff --git a/trunk/net/rds/ib_cm.c b/trunk/net/rds/ib_cm.c
index a1e116277477..31b74f5e61ad 100644
--- a/trunk/net/rds/ib_cm.c
+++ b/trunk/net/rds/ib_cm.c
@@ -434,12 +434,11 @@ static u32 rds_ib_protocol_compatible(struct rdma_cm_event *event)
 		version = RDS_PROTOCOL_3_0;
 		while ((common >>= 1) != 0)
 			version++;
-	}
-	printk_ratelimited(KERN_NOTICE "RDS: Connection from %pI4 using "
-			"incompatible protocol version %u.%u\n",
-			&dp->dp_saddr,
-			dp->dp_protocol_major,
-			dp->dp_protocol_minor);
+	} else
+		printk_ratelimited(KERN_NOTICE "RDS: Connection from %pI4 using incompatible protocol version %u.%u\n",
+				&dp->dp_saddr,
+				dp->dp_protocol_major,
+				dp->dp_protocol_minor);
 	return version;
 }