| Message ID | 1428092835-16834-11-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: > Since we already print this message when a reset is requested via the > RESET_REQUESTED flag, we do not need to print it before setting the > flag. > > 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_main.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 11/25] fm10k: remove extraneous "Reset interface" message On Fri, 2015-04-03 at 13:27 -0700, Jeff Kirsher wrote: > Since we already print this message when a reset is requested via the > RESET_REQUESTED flag, we do not need to print it before setting the > flag. > > 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_main.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_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c index e2c27ba..5022a45 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c @@ -1191,7 +1191,6 @@ void fm10k_tx_timeout_reset(struct fm10k_intfc *interface) { /* Do the reset outside of interrupt context */ if (!test_bit(__FM10K_DOWN, &interface->state)) { - netdev_err(interface->netdev, "Reset interface\n"); interface->tx_timeout_count++; interface->flags |= FM10K_FLAG_RESET_REQUESTED; fm10k_service_event_schedule(interface);