igb: Fix master/slave mode for all m88 i354 PHY's (d1c17d80) · Commits · 戴 / test

This patch calls code to set the master/slave mode for all m88 gen 2 PHY's. This patch also removes the call to this function for I210 devices only from the function that is not called by I210 devices. Signed-off-by:

Carolyn Wyborny <carolyn.wyborny@intel.com> Tested-by:

Jeff Pieper <jeffrey.e.pieper@gmail.com> Signed-off-by:

Jeff Kirsher <jeffrey.t.kirsher@intel.com>

drivers/net/ethernet/intel/igb/e1000_phy.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -708,11 +708,6 @@ s32 igb_copper_link_setup_m88(struct e1000_hw *hw)
		hw_dbg("Error committing the PHY changes\n");
		goto out;
		}
		if (phy->type == e1000_phy_i210) {
		ret_val = igb_set_master_slave_mode(hw);
		if (ret_val)
		return ret_val;
		}

		out:
		return ret_val;
		@@ -806,6 +801,9 @@ s32 igb_copper_link_setup_m88_gen2(struct e1000_hw *hw)
		hw_dbg("Error committing the PHY changes\n");
		return ret_val;
		}
		ret_val = igb_set_master_slave_mode(hw);
		if (ret_val)
		return ret_val;

		return 0;
		}

Admin message