D36923.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D36923.id.diff
View Options

	diff --git a/sys/dev/igc/igc_i225.c b/sys/dev/igc/igc_i225.c
	--- a/sys/dev/igc/igc_i225.c
	+++ b/sys/dev/igc/igc_i225.c
	@@ -169,16 +169,7 @@
	goto out;

	ret_val = igc_get_phy_id(hw);
	- /* Verify phy id and set remaining function pointers */
	- switch (phy->id) {
	- case I225_I_PHY_ID:
	- default:
	- phy->type = igc_phy_i225;
	- phy->ops.set_d0_lplu_state = igc_set_d0_lplu_state_i225;
	- phy->ops.set_d3_lplu_state = igc_set_d3_lplu_state_i225;
	- /* TODO - complete with GPY PHY information */
	- break;
	- }
	+ phy->type = igc_phy_i225;

	out:
	return ret_val;
	diff --git a/sys/dev/igc/igc_phy.c b/sys/dev/igc/igc_phy.c
	--- a/sys/dev/igc/igc_phy.c
	+++ b/sys/dev/igc/igc_phy.c
	@@ -310,8 +310,7 @@
	return ret_val;
	}

	- if ((phy->autoneg_mask & ADVERTISE_2500_FULL) &&
	- hw->phy.id == I225_I_PHY_ID) {
	+ if (phy->autoneg_mask & ADVERTISE_2500_FULL) {
	/* Read the MULTI GBT AN Control Register - reg 7.32 */
	ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK <<
	MMD_DEVADDR_SHIFT) \|
	@@ -451,8 +450,7 @@
	ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL,
	mii_1000t_ctrl_reg);

	- if ((phy->autoneg_mask & ADVERTISE_2500_FULL) &&
	- hw->phy.id == I225_I_PHY_ID)
	+ if (phy->autoneg_mask & ADVERTISE_2500_FULL)
	ret_val = phy->ops.write_reg(hw,
	(STANDARD_AN_REG_MASK <<
	MMD_DEVADDR_SHIFT) \|