From 17202a19288a853e8242ad475f18c57d9f35f48d Mon Sep 17 00:00:00 2001 From: Carolyn Wyborny Date: Thu, 28 Oct 2010 00:59:55 +0000 Subject: [PATCH] --- yaml --- r: 220937 b: refs/heads/master c: affa9dfb04b7e2e3a0b0e6d844ea0c9ed97505f9 h: refs/heads/master i: 220935: de793e23b2ccd2e506dc785ac5d1067ce0ff8024 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c5535a21bb0e..0cf9ec21f7bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff10e13cd06f3dbe90e9fffc3c2dd2057a116e4b +refs/heads/master: affa9dfb04b7e2e3a0b0e6d844ea0c9ed97505f9 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index 35a9dd4353d7..c4ca1629f532 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/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); }