---

yaml --- r: 203118 b: refs/heads/master c: f2e2b3a h: refs/heads/master v: v3
git-mirror · Jun 23, 2010 · 4dec123 · 4dec123
1 parent aa6e274
commit 4dec123
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c6bdb3084d015221270b418190b630553a38cf8
+refs/heads/master: f2e2b3abe4f491130cfda814a8547783b08f10c2
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
@@ -3184,8 +3184,6 @@ void e1000e_reset(struct e1000_adapter *adapter)
 		e1000_get_hw_control(adapter);
 
 	ew32(WUC, 0);
-	if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP)
-		e1e_wphy(&adapter->hw, BM_WUC, 0);
 
 	if (mac->ops.init_hw(hw))
 		e_err("Hardware Error\n");