From: Bruce Allan Date: Sat, 22 Nov 2008 00:49:53 +0000 (-0800) Subject: e1000e: commit speed/duplex changes for m88 PHY X-Git-Tag: v2.6.29-rc1~581^2~591 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=5aa49c82118d2aa08c6cfaba01fd86f969b3f1d7;hp=005cbdfc29cfc23b8faadd3619eed43e6550bfc1;p=safe%2Fjmp%2Flinux-2.6 e1000e: commit speed/duplex changes for m88 PHY Follow the convention used elsewhere in e1000e to 'commit' PHY changes instead of directly writing to the PHY CTRL register to reset it. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller --- diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c index 6cd333a..cb7d71e 100644 --- a/drivers/net/e1000e/phy.c +++ b/drivers/net/e1000e/phy.c @@ -1030,14 +1030,14 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw) e1000e_phy_force_speed_duplex_setup(hw, &phy_data); - /* Reset the phy to commit changes. */ - phy_data |= MII_CR_RESET; - ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data); if (ret_val) return ret_val; - udelay(1); + /* Reset the phy to commit changes. */ + ret_val = e1000e_commit_phy(hw); + if (ret_val) + return ret_val; if (phy->autoneg_wait_to_complete) { hw_dbg(hw, "Waiting for forced speed/duplex link on M88 phy.\n");