net/i40e: remove duplicate tunnel type check

[dpdk.git] / drivers / net / ixgbe / base / ixgbe_common.c

diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
index cecc647..aa843bd 100644 (file)
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -186,10 +186,6 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
                break;
        }
 
-       if (!supported)
-               ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED,
-                             "Device %x does not support flow control autoneg",
-                             hw->device_id);
        return supported;
 }
 
@@ -421,7 +417,7 @@ s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw)
  *    82599
  *    X540
  **/
-s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw)
+void ixgbe_start_hw_gen2(struct ixgbe_hw *hw)
 {
        u32 i;
        u32 regval;
@@ -446,8 +442,6 @@ s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw)
                            IXGBE_DCA_RXCTRL_HEAD_WRO_EN);
                IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);
        }
-
-       return IXGBE_SUCCESS;
 }
 
 /**
@@ -3082,8 +3076,9 @@ void ixgbe_fc_autoneg(struct ixgbe_hw *hw)
         * - link is not up.
         */
        if (hw->fc.disable_fc_autoneg) {
-               ERROR_REPORT1(IXGBE_ERROR_UNSUPPORTED,
-                            "Flow control autoneg is disabled");
+               /* TODO: This should be just an informative log */
+               ERROR_REPORT1(IXGBE_ERROR_CAUTION,
+                             "Flow control autoneg is disabled");
                goto out;
        }
 
@@ -4223,17 +4218,9 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
                break;
        case IXGBE_LINKS_SPEED_10_X550EM_A:
                *speed = IXGBE_LINK_SPEED_UNKNOWN;
-#ifdef PREBOOT_SUPPORT
-               if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
-                   hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L ||
-                   hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII ||
-                   hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII_L)
-                       *speed = IXGBE_LINK_SPEED_10_FULL;
-#else
                if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
                    hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L)
                        *speed = IXGBE_LINK_SPEED_10_FULL;
-#endif /* PREBOOT_SUPPORT */
                break;
        default:
                *speed = IXGBE_LINK_SPEED_UNKNOWN;