---

yaml --- r: 220937 b: refs/heads/master c: affa9df h: refs/heads/master i: 220935: de793e2 v: v3
git-mirror · Oct 28, 2010 · 17202a1 · 17202a1
1 parent bc0b341
commit 17202a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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);
 }