[Intel-wired-lan] [net-next 12/25] fm10k: only increment tx_timeout_count in Tx hang path

Jeff Kirsher jeffrey.t.kirsher at intel.com
Fri Apr 3 20:27:02 UTC 2015

We were incrementing the tx_timeout_count for both the Tx hang
and then for all reset flows.  Instead, we should only increment
tx_timeout_count in the Tx hang path, so that our Tx hang counter
does not increment when it was not caused by a Tx hang.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller at intel.com>
Acked-by: Matthew Vick <matthew.vick at intel.com>
 drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 0ef1d71..d7af466 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -191,7 +191,6 @@ static void fm10k_reset_subtask(struct fm10k_intfc *interface)
 	interface->flags &= ~FM10K_FLAG_RESET_REQUESTED;
 	netdev_err(interface->netdev, "Reset interface\n");
-	interface->tx_timeout_count++;

More information about the Intel-wired-lan mailing list