Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aa49c82 authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

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: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 005cbdfc

drivers/net/e1000e/phy.c

+4 −4
Original line number Diff line number Diff line
@@ -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");