From 4dec123f71e6eee2d0015d90dc836de5551c9e2d Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Thu, 17 Jun 2010 18:59:06 +0000 Subject: [PATCH] --- yaml --- r: 203118 b: refs/heads/master c: f2e2b3abe4f491130cfda814a8547783b08f10c2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 68d5de0ea156..b0e08f67114f 100644 --- 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 index 2a71889112b6..aa14976c8221 100644 --- 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");