From: Erez Shitrit <erezsh@mellanox.com>
Date: Wed, 14 Nov 2012 13:06:03 +0000 (+0200)
Subject: ib/ipoib: debug prints instead of warn in tx_wc function
X-Git-Tag: v4.1.12-92~293^2~1^2~96
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dcae04dae60815ab84381e06664f985c83409e39;p=users%2Fjedix%2Flinux-maple.git

ib/ipoib: debug prints instead of warn in tx_wc function

In IB_WC_RNR_RETRY_EXC_ERR status print debug message else
print error message. IB_WC_RNR_RETRY_EXC_ERR is part of the
CM life cycle.

Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
(Ported from Mellanox OFED 2.4)

Signed-off-by: Mukesh Kacker <mukesh.kacker@oracle.com>
---

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 9168db77404a2..a4569d77d1a5e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -811,9 +811,15 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
 	    wc->status != IB_WC_WR_FLUSH_ERR) {
 		struct ipoib_neigh *neigh;
 
-		ipoib_dbg(priv, "failed cm send event "
-			   "(status=%d, wrid=%d vend_err %x)\n",
-			   wc->status, wr_id, wc->vendor_err);
+		/*IB_WC_RNR_RETRY_EXC_ERR error is part of the life cycle, so don't make waves.*/
+		if (IB_WC_RNR_RETRY_EXC_ERR != wc->status)
+			ipoib_warn(priv, "%s: failed cm send event "
+				   "(status=%d, wrid=%d vend_err %x)\n",
+				   __func__, wc->status, wr_id, wc->vendor_err);
+		else
+			ipoib_dbg(priv, "%s: failed cm send event "
+				   "(status=%d, wrid=%d vend_err %x)\n",
+				   __func__, wc->status, wr_id, wc->vendor_err);
 
 		spin_lock_irqsave(&priv->lock, flags);
 		neigh = tx->neigh;