OSDN Git Service

ixgbe: fix incorrect status check
authorEmil Tantilov <emil.s.tantilov@intel.com>
Thu, 18 May 2017 23:45:06 +0000 (16:45 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 31 May 2017 11:54:12 +0000 (04:54 -0700)
Check for ret_val instead of !ret_val to allow the rest of
the code to execute and configure the speed properly.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c

index 80824fe..72d84a0 100644 (file)
@@ -1750,14 +1750,14 @@ ixgbe_setup_mac_link_sfp_n(struct ixgbe_hw *hw, ixgbe_link_speed speed,
        if (ret_val == IXGBE_ERR_SFP_NOT_PRESENT)
                return 0;
 
-       if (!ret_val)
+       if (ret_val)
                return ret_val;
 
        /* Configure internal PHY for native SFI based on module type */
        ret_val = hw->mac.ops.read_iosf_sb_reg(hw,
                                IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
                                IXGBE_SB_IOSF_TARGET_KR_PHY, &reg_phy_int);
-       if (!ret_val)
+       if (ret_val)
                return ret_val;
 
        reg_phy_int &= IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_DA;
@@ -1767,7 +1767,7 @@ ixgbe_setup_mac_link_sfp_n(struct ixgbe_hw *hw, ixgbe_link_speed speed,
        ret_val = hw->mac.ops.write_iosf_sb_reg(hw,
                                IXGBE_KRM_PMD_FLX_MASK_ST20(hw->bus.lan_id),
                                IXGBE_SB_IOSF_TARGET_KR_PHY, reg_phy_int);
-       if (!ret_val)
+       if (ret_val)
                return ret_val;
 
        /* Setup SFI internal link. */
@@ -1798,7 +1798,7 @@ ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw, ixgbe_link_speed speed,
        if (ret_val == IXGBE_ERR_SFP_NOT_PRESENT)
                return 0;
 
-       if (!ret_val)
+       if (ret_val)
                return ret_val;
 
        /* Configure internal PHY for KR/KX. */