From: Emil Tantilov Date: Wed, 14 Aug 2013 07:12:27 +0000 (+0000) Subject: ixgbe: include QSFP PHY types in ixgbe_is_sfp() X-Git-Tag: MMI-PSA29.97-13-9~13727^2~152^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=987e1d56b3157592d73f7f6170decada716fc415;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ixgbe: include QSFP PHY types in ixgbe_is_sfp() This patch makes sure that QSFP+ modules use the SFP+ code path for setting up link. Signed-off-by: Emil Tantilov Tested-by: Phil Schmitt Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 46880576979e..7aba452833e5 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -4175,6 +4175,10 @@ static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw) case ixgbe_phy_sfp_passive_unknown: case ixgbe_phy_sfp_active_unknown: case ixgbe_phy_sfp_ftl_active: + case ixgbe_phy_qsfp_passive_unknown: + case ixgbe_phy_qsfp_active_unknown: + case ixgbe_phy_qsfp_intel: + case ixgbe_phy_qsfp_unknown: return true; case ixgbe_phy_nl: if (hw->mac.type == ixgbe_mac_82598EB)