summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarciniszyn, Mike <mike.marciniszyn@intel.com>2012-12-21 09:01:54 +0100
committerDavid S. Miller <davem@davemloft.net>2012-12-27 00:17:37 +0100
commita49675988c127b5b5876c252e5db2ee0410a10c2 (patch)
tree06775f343edbf3d15a32e7779d3767a023628b6e /net
parentIB/rds: Correct ib_api use with gs_dma_address/sg_dma_len (diff)
downloadlinux-a49675988c127b5b5876c252e5db2ee0410a10c2.tar.xz
linux-a49675988c127b5b5876c252e5db2ee0410a10c2.zip
IB/rds: suppress incompatible protocol when version is known
Add an else to only print the incompatible protocol message when version hasn't been established. Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/rds/ib_cm.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index a1e116277477..31b74f5e61ad 100644
--- a/net/rds/ib_cm.c
+++ b/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;
}