All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mike Marciniszyn <mike.marciniszyn@intel.com>
To: venkat.x.venkatsubra@oracle.com
Cc: linux-rdma@vger.kernel.org, roland@kernel.org,
	rds-devel@oss.oracle.com, davem@davemloft.net,
	netdev@vger.kernel.org
Subject: [PATCH 2/2] IB/rds: suppress incompatible protocol when version is known
Date: Fri, 21 Dec 2012 13:01:54 -0500	[thread overview]
Message-ID: <20121221180154.23716.44540.stgit@phlsvslse11.ph.intel.com> (raw)
In-Reply-To: <20121221175857.23716.46975.stgit@phlsvslse11.ph.intel.com>

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>
---
 net/rds/ib_cm.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index a1e1162..31b74f5 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;
 }
 

  parent reply	other threads:[~2012-12-21 18:01 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-21 18:01 [PATCH 0/2] Re-submit RDS patches Mike Marciniszyn
2012-12-21 18:01 ` [PATCH 1/2] IB/rds: Correct ib_api use with gs_dma_address/sg_dma_len Mike Marciniszyn
     [not found]   ` <20121221180149.23716.54707.stgit-K+u1se/DcYrLESAwzcoQNrvm/XP+8Wra@public.gmane.org>
2012-12-25 12:10     ` Bart Van Assche
     [not found]       ` <50D997D0.2020004-HInyCGIudOg@public.gmane.org>
2012-12-26 23:21         ` David Miller
2012-12-26 23:18   ` David Miller
2012-12-21 18:01 ` Mike Marciniszyn [this message]
2012-12-26 23:18   ` [PATCH 2/2] IB/rds: suppress incompatible protocol when version is known David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121221180154.23716.44540.stgit@phlsvslse11.ph.intel.com \
    --to=mike.marciniszyn@intel.com \
    --cc=davem@davemloft.net \
    --cc=linux-rdma@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rds-devel@oss.oracle.com \
    --cc=roland@kernel.org \
    --cc=venkat.x.venkatsubra@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.