2 files changed, 2 insertions, 7 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index cc70de259829..23e4e6a4b4b1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -161,13 +161,6 @@ static int ixgbe_get_settings(struct net_device *netdev,
         bool autoneg = false;
         bool link_up;
 
-        /* SFP type is needed for get_link_capabilities */
-        if (hw->phy.media_type & (ixgbe_media_type_fiber |
-                                  ixgbe_media_type_fiber_qsfp)) {
-                if (hw->phy.sfp_type == ixgbe_sfp_type_not_present)
-                                hw->phy.ops.identify_sfp(hw);
-        }
-
         hw->mac.ops.get_link_capabilities(hw, &supported_link, &autoneg);
 
         /* set the supported link speeds */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index ea11e2c8ee8c..e22278a5cbfa 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -4656,6 +4656,8 @@ static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw)
         case ixgbe_phy_qsfp_active_unknown:
         case ixgbe_phy_qsfp_intel:
         case ixgbe_phy_qsfp_unknown:
+        /* ixgbe_phy_none is set when no SFP module is present */
+        case ixgbe_phy_none:
                 return true;
         case ixgbe_phy_nl:
                 if (hw->mac.type == ixgbe_mac_82598EB)