AuxXxilium/synology-igc
1
0
Fork 0
mirror of https://github.com/AuxXxilium/synology-igc.git synced 2024-11-23 23:11:07 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

igc: Remove _I_PHY_ID checking

Browse Source 
backport from 7c496de538

Signed-off-by: Jim Ma <majinjing3@gmail.com>
This commit is contained in:
Jim Ma 2022-11-16 13:25:14 +00:00
parent 16d3d2cf00
commit c6b6a8f3eb
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
igc_base.c
View File

@ -187,15 +187,7 @@ static s32 igc_init_phy_params_base(struct igc_hw *hw)
igc_check_for_copper_link(hw); igc_check_for_copper_link(hw);
/* Verify phy id and set remaining function pointers */ phy->type = igc_phy_i225;
switch (phy->id) {
case I225_I_PHY_ID:
phy->type = igc_phy_i225;
break;
default:
ret_val = -IGC_ERR_PHY;
goto out;
}
out: out:
return ret_val; return ret_val;

3
igc_main.c
View File

@ -4147,8 +4147,7 @@ bool igc_has_link(struct igc_adapter *adapter)
hw->mac.ops.check_for_link(hw); hw->mac.ops.check_for_link(hw);
link_active = !hw->mac.get_link_status; link_active = !hw->mac.get_link_status;
if (hw->mac.type == igc_i225 && if (hw->mac.type == igc_i225) {
hw->phy.id == I225_I_PHY_ID) {
if (!netif_carrier_ok(adapter->netdev)) { if (!netif_carrier_ok(adapter->netdev)) {
adapter->flags &= ~IGC_FLAG_NEED_LINK_UPDATE; adapter->flags &= ~IGC_FLAG_NEED_LINK_UPDATE;
} else if (!(adapter->flags & IGC_FLAG_NEED_LINK_UPDATE)) { } else if (!(adapter->flags & IGC_FLAG_NEED_LINK_UPDATE)) {

6
igc_phy.c
View File

@ -249,8 +249,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw)
return ret_val; return ret_val;
} }
if ((phy->autoneg_mask & ADVERTISE_2500_FULL) && if (phy->autoneg_mask & ADVERTISE_2500_FULL) {
hw->phy.id == I225_I_PHY_ID) {
/* Read the MULTI GBT AN Control Register - reg 7.32 */ /* Read the MULTI GBT AN Control Register - reg 7.32 */
ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK << ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK <<
MMD_DEVADDR_SHIFT) | MMD_DEVADDR_SHIFT) |
@ -390,8 +389,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw)
ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL, ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL,
mii_1000t_ctrl_reg); mii_1000t_ctrl_reg);
if ((phy->autoneg_mask & ADVERTISE_2500_FULL) && if (phy->autoneg_mask & ADVERTISE_2500_FULL)
hw->phy.id == I225_I_PHY_ID)
ret_val = phy->ops.write_reg(hw, ret_val = phy->ops.write_reg(hw,
(STANDARD_AN_REG_MASK << (STANDARD_AN_REG_MASK <<
MMD_DEVADDR_SHIFT) | MMD_DEVADDR_SHIFT) |