e1000e: Add check for reset flags before displaying reset message
Subsystems (2)
PATCH 1/1 e1000e: Add check for reset flags before displaying reset message
From: Carolyn Wyborny <[email protected]>
Some parts need to execute resets during normal operation. This flag check ensures that those parts reset without needlessly alarming the user. Other unexpected resets by other parts will dump debug info and message the reset action to the user, as originally intended.
---
drivers/net/e1000e/netdev.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/net/e1000e/netdev.c +5 -2
@@ -4882,8 +4882,11 @@ static void e1000_reset_task(struct work_struct *work)struct e1000_adapter *adapter; adapter = container_of(work, struct e1000_adapter, reset_task); -e1000e_dump (adapter); -e_err ("Reset adapter\n" ); +if (!((adapter->flags &FLAG_RX_NEEDS_RESTART ) && + (adapter->flags &FLAG_RX_RESTART_NOW ))) { +e1000e_dump (adapter); +e_err ("Reset adapter\n" ); + }e1000e_reinit_locked (adapter); }
From: Jeff Kirsher <[email protected]>
Date: Thu, 28 Oct 2010 03:59:55 -0700
Quoted 11 lines
From: Carolyn Wyborny <[email protected]>
Some parts need to execute resets during normal operation. This flag check ensures that those parts reset without needlessly alarming the user. Other unexpected resets by other parts will dump debug info and message the reset action to the user, as originally intended.
Signed-off-by Carolyn Wyborny <[email protected]>Acked-by Bruce Allan <[email protected]>Tested-by Emil Tantilov <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.