aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
authorCarolyn Wyborny <carolyn.wyborny@intel.com>2010-10-28 00:59:55 +0000
committerDavid S. Miller <davem@davemloft.net>2010-10-28 10:18:59 -0700
commitaffa9dfb04b7e2e3a0b0e6d844ea0c9ed97505f9 (patch)
tree5bf0e4f0d230b237a19ddbafc2bcdb62dbd704fe /drivers/net/e1000e/netdev.c
parentff10e13cd06f3dbe90e9fffc3c2dd2057a116e4b (diff)
downloadkernel_goldelico_gta04-affa9dfb04b7e2e3a0b0e6d844ea0c9ed97505f9.zip
kernel_goldelico_gta04-affa9dfb04b7e2e3a0b0e6d844ea0c9ed97505f9.tar.gz
kernel_goldelico_gta04-affa9dfb04b7e2e3a0b0e6d844ea0c9ed97505f9.tar.bz2
e1000e: Add check for reset flags before displaying reset message
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 <carolyn.wyborny@intel.com> Acked-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Emil Tantilov <emil.s.tantilov@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r--drivers/net/e1000e/netdev.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 35a9dd4..c4ca162 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -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);
}