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