Message ID | 1428092835-16834-12-git-send-email-jeffrey.t.kirsher@intel.com |
---|---|
State | Accepted |
Delegated to: | Jeff Kirsher |
Headers | show |
On Fri, 2015-04-03 at 13:27 -0700, Jeff Kirsher wrote: > 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@intel.com> > Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> > Acked-by: Matthew Vick <matthew.vick@intel.com> > --- > drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 - > 1 file changed, 1 deletion(-) I have applied to my queue.
-----Original Message----- From: Kirsher, Jeffrey T Sent: Friday, April 3, 2015 2:04 PM To: intel-wired-lan@lists.osuosl.org Cc: Keller, Jacob E; Singh, Krishneil K Subject: Re: [net-next 12/25] fm10k: only increment tx_timeout_count in Tx hang path On Fri, 2015-04-03 at 13:27 -0700, Jeff Kirsher wrote: > 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@intel.com> > Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> > Acked-by: Matthew Vick <matthew.vick@intel.com> > --- > drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 - > 1 file changed, 1 deletion(-) I have applied to my queue. -- git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git dev-queue Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
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++; fm10k_reinit(interface); }