apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

e1000e: commit speed/duplex changes for m88 PHY

Browse Source 
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 <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Bruce Allan
2008-11-21 16:49:53 -08:00
committed by David S. Miller
parent 005cbdfc29
commit 5aa49c8211
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/e1000e/phy.c
+4 -4
View File
@@ -1030,14 +1030,14 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
e1000e_phy_force_speed_duplex_setup(hw, &phy_data); 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); ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data);
if (ret_val) if (ret_val)
return 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) { if (phy->autoneg_wait_to_complete) {
hw_dbg(hw, "Waiting for forced speed/duplex link on M88 phy.\n"); hw_dbg(hw, "Waiting for forced speed/duplex link on M88 phy.\n");