IB/{ipoib, iser}: Consistent print format of vendor error

Vendor error print should be consistent across protocols to avoid any
confusion.
This patch corrects that.

Suggested-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Acked-by: Wengang Wang <wen.gang.wang@oracle.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Acked-by: Sagi Grimberg <sagi@grimberg.me>
Acked-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 7774654c2ccbce600f99e751c7b37e15e7f1dd8a..7500c28eac6b2f11a154ccf118926fd84b2023ec 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -594,9 +594,9 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
        skb = rx_ring[wr_id].skb;
 
        if (unlikely(wc->status != IB_WC_SUCCESS)) {
-               ipoib_dbg(priv, "cm recv error "
-                          "(status=%d, wrid=%d vend_err %x)\n",
-                          wc->status, wr_id, wc->vendor_err);
+               ipoib_dbg(priv,
+                         "cm recv error (status=%d, wrid=%d vend_err %#x)\n",
+                         wc->status, wr_id, wc->vendor_err);
                ++dev->stats.rx_dropped;
                if (has_srq)
                        goto repost;
@@ -829,11 +829,11 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
                if (wc->status == IB_WC_RNR_RETRY_EXC_ERR ||
                    wc->status == IB_WC_RETRY_EXC_ERR)
                        ipoib_dbg(priv,
-                                 "%s: failed cm send event (status=%d, wrid=%d vend_err 0x%x)\n",
+                                 "%s: failed cm send event (status=%d, wrid=%d vend_err %#x)\n",
                                   __func__, wc->status, wr_id, wc->vendor_err);
                else
                        ipoib_warn(priv,
-                                   "%s: failed cm send event (status=%d, wrid=%d vend_err 0x%x)\n",
+                                   "%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);

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 2e075377242e2baccc54cda5859d5b3ba7e768d0..dfd457567aff50f40a641a461ec774bbd99841ef 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -192,8 +192,8 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
 
        if (unlikely(wc->status != IB_WC_SUCCESS)) {
                if (wc->status != IB_WC_WR_FLUSH_ERR)
-                       ipoib_warn(priv, "failed recv event "
-                                  "(status=%d, wrid=%d vend_err %x)\n",
+                       ipoib_warn(priv,
+                                  "failed recv event (status=%d, wrid=%d vend_err %#x)\n",
                                   wc->status, wr_id, wc->vendor_err);
                ipoib_ud_dma_unmap_rx(priv, priv->rx_ring[wr_id].mapping);
                dev_kfree_skb_any(skb);
@@ -414,8 +414,8 @@ static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
        if (wc->status != IB_WC_SUCCESS &&
            wc->status != IB_WC_WR_FLUSH_ERR) {
                struct ipoib_qp_state_validate *qp_work;
-               ipoib_warn(priv, "failed send event "
-                          "(status=%d, wrid=%d vend_err %x)\n",
+               ipoib_warn(priv,
+                          "failed send event (status=%d, wrid=%d vend_err %#x)\n",
                           wc->status, wr_id, wc->vendor_err);
                qp_work = kzalloc(sizeof(*qp_work), GFP_ATOMIC);
                if (!qp_work)

diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 55a73b0ed4c66f1f34da8067bd4d57376f84febb..56b7240a3fc30a1136881da5db8f3f13a08cdbe0 100644 (file)
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -1146,7 +1146,7 @@ void iser_err_comp(struct ib_wc *wc, const char *type)
        if (wc->status != IB_WC_WR_FLUSH_ERR) {
                struct iser_conn *iser_conn = to_iser_conn(wc->qp->qp_context);
 
-               iser_err("%s failure: %s (%d) vend_err %x\n", type,
+               iser_err("%s failure: %s (%d) vend_err %#x\n", type,
                         ib_wc_status_msg(wc->status), wc->status,
                         wc->vendor_err);