Skip to content

Commit b04dc19

Browse files
Ajaykumar Hotchandanidledford
authored andcommitted
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 <[email protected]> Signed-off-by: Ajaykumar Hotchandani <[email protected]> Reviewed-by: Santosh Shilimkar <[email protected]> Acked-by: Wengang Wang <[email protected]> Reviewed-by: Yuval Shaia <[email protected]> Signed-off-by: Yuval Shaia <[email protected]> Acked-by: Sagi Grimberg <[email protected]> Acked-by: Roi Dayan <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent e1ac263 commit b04dc19

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

drivers/infiniband/ulp/ipoib/ipoib_cm.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -594,9 +594,9 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
594594
skb = rx_ring[wr_id].skb;
595595

596596
if (unlikely(wc->status != IB_WC_SUCCESS)) {
597-
ipoib_dbg(priv, "cm recv error "
598-
"(status=%d, wrid=%d vend_err %x)\n",
599-
wc->status, wr_id, wc->vendor_err);
597+
ipoib_dbg(priv,
598+
"cm recv error (status=%d, wrid=%d vend_err %#x)\n",
599+
wc->status, wr_id, wc->vendor_err);
600600
++dev->stats.rx_dropped;
601601
if (has_srq)
602602
goto repost;
@@ -829,11 +829,11 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
829829
if (wc->status == IB_WC_RNR_RETRY_EXC_ERR ||
830830
wc->status == IB_WC_RETRY_EXC_ERR)
831831
ipoib_dbg(priv,
832-
"%s: failed cm send event (status=%d, wrid=%d vend_err 0x%x)\n",
832+
"%s: failed cm send event (status=%d, wrid=%d vend_err %#x)\n",
833833
__func__, wc->status, wr_id, wc->vendor_err);
834834
else
835835
ipoib_warn(priv,
836-
"%s: failed cm send event (status=%d, wrid=%d vend_err 0x%x)\n",
836+
"%s: failed cm send event (status=%d, wrid=%d vend_err %#x)\n",
837837
__func__, wc->status, wr_id, wc->vendor_err);
838838

839839
spin_lock_irqsave(&priv->lock, flags);

drivers/infiniband/ulp/ipoib/ipoib_ib.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
192192

193193
if (unlikely(wc->status != IB_WC_SUCCESS)) {
194194
if (wc->status != IB_WC_WR_FLUSH_ERR)
195-
ipoib_warn(priv, "failed recv event "
196-
"(status=%d, wrid=%d vend_err %x)\n",
195+
ipoib_warn(priv,
196+
"failed recv event (status=%d, wrid=%d vend_err %#x)\n",
197197
wc->status, wr_id, wc->vendor_err);
198198
ipoib_ud_dma_unmap_rx(priv, priv->rx_ring[wr_id].mapping);
199199
dev_kfree_skb_any(skb);
@@ -414,8 +414,8 @@ static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
414414
if (wc->status != IB_WC_SUCCESS &&
415415
wc->status != IB_WC_WR_FLUSH_ERR) {
416416
struct ipoib_qp_state_validate *qp_work;
417-
ipoib_warn(priv, "failed send event "
418-
"(status=%d, wrid=%d vend_err %x)\n",
417+
ipoib_warn(priv,
418+
"failed send event (status=%d, wrid=%d vend_err %#x)\n",
419419
wc->status, wr_id, wc->vendor_err);
420420
qp_work = kzalloc(sizeof(*qp_work), GFP_ATOMIC);
421421
if (!qp_work)

drivers/infiniband/ulp/iser/iser_verbs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,7 @@ void iser_err_comp(struct ib_wc *wc, const char *type)
11461146
if (wc->status != IB_WC_WR_FLUSH_ERR) {
11471147
struct iser_conn *iser_conn = to_iser_conn(wc->qp->qp_context);
11481148

1149-
iser_err("%s failure: %s (%d) vend_err %x\n", type,
1149+
iser_err("%s failure: %s (%d) vend_err %#x\n", type,
11501150
ib_wc_status_msg(wc->status), wc->status,
11511151
wc->vendor_err);
11521152

0 commit comments

Comments
 (0)