From 8f4c2bb3099164da674e368aba13388d07c8f874 Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov Date: Thu, 27 Aug 2020 19:09:42 +0200 Subject: [PATCH 2/5] Revert "[netdrv] ice: Fix format specifier" This reverts commit 8ae7b8e7e4f25904a36660971dafc8949d7f318a. --- drivers/net/ethernet/intel/ice/ice_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index a9ce5720588f..b6e5dc22f97f 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5478,13 +5478,13 @@ static void ice_tx_timeout(struct net_device *netdev, unsigned int txqueue) /* Read interrupt register */ val = rd32(hw, GLINT_DYN_CTL(tx_ring->q_vector->reg_idx)); - netdev_info(netdev, "tx_timeout: VSI_num: %d, Q %u, NTC: 0x%x, HW_HEAD: 0x%x, NTU: 0x%x, INT: 0x%x\n", + netdev_info(netdev, "tx_timeout: VSI_num: %d, Q %d, NTC: 0x%x, HW_HEAD: 0x%x, NTU: 0x%x, INT: 0x%x\n", vsi->vsi_num, txqueue, tx_ring->next_to_clean, head, tx_ring->next_to_use, val); } pf->tx_timeout_last_recovery = jiffies; - netdev_info(netdev, "tx_timeout recovery level %d, txqueue %u\n", + netdev_info(netdev, "tx_timeout recovery level %d, txqueue %d\n", pf->tx_timeout_recovery_level, txqueue); switch (pf->tx_timeout_recovery_level) { -- 2.13.6