This patch changes the return value for ixgbe_setup_internal_phy_t_x550em when link is down to IXGBE_SUCCESS. The driver will call ixgbe_setup_internal_phy_t_x550em when a link status change is reported. The links status change can occur on link up or link down, and if the link status change is for link down then there is no iXFI setup necessary and no error condition needs to be returned.
Signed-off-by: Wenzhuo Lu <wenzhuo.lu at intel.com> --- drivers/net/ixgbe/base/ixgbe_x550.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c index 146b2d4..87942bb 100644 --- a/drivers/net/ixgbe/base/ixgbe_x550.c +++ b/drivers/net/ixgbe/base/ixgbe_x550.c @@ -1578,9 +1578,9 @@ s32 ixgbe_setup_internal_phy_x550em(struct ixgbe_hw *hw) if (status != IXGBE_SUCCESS) return status; - /* If link is not up return an error indicating treat link as down */ + /* If link is not up, then there is no setup necessary so return */ if (!(autoneg_status & IXGBE_MDIO_AUTO_NEG_LINK_STATUS)) - return IXGBE_ERR_INVALID_LINK_SETTINGS; + return IXGBE_SUCCESS; status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_VENDOR_STAT, IXGBE_MDIO_AUTO_NEG_DEV_TYPE, -- 1.9.3