From 20c6d5f67970a7dfc510d4bdc484bcc259610161 Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Mon, 18 May 2009 13:01:28 -0400 Subject: [PATCH] revert cb52deba12f27af90a46d2f8667a64888118a888 --- drivers/net/forcedeth.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index df0794e..11ade32 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -1446,9 +1446,9 @@ static int phy_init(struct net_device *dev) /* some phys clear out pause advertisment on reset, set it back */ mii_rw(dev, np->phyaddr, MII_ADVERTISE, reg); - /* restart auto negotiation, power down phy */ + /* restart auto negotiation */ mii_control = mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ); - mii_control |= (BMCR_ANRESTART | BMCR_ANENABLE | BMCR_PDOWN); + mii_control |= (BMCR_ANRESTART | BMCR_ANENABLE); if (mii_rw(dev, np->phyaddr, MII_BMCR, mii_control)) { return PHY_ERROR; } @@ -5407,10 +5407,6 @@ static int nv_close(struct net_device *dev) if (np->wolenabled) { writel(NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR, base + NvRegPacketFilterFlags); nv_start_rx(dev); - } else { - /* power down phy */ - mii_rw(dev, np->phyaddr, MII_BMCR, - mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ)|BMCR_PDOWN); } /* FIXME: power down nic */ -- 1.6.2.2