Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29a8dca1 authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbe: Accept SFP not present errors on all devices 



When an SFP not present error is returned by the reset_hw method,
accept it and go on, since an SFP can still be inserted. Previously
it was only accepted for 82598 devices.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0f90300f

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −2
Original line number Diff line number Diff line
@@ -8710,8 +8710,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	hw->phy.reset_if_overtemp = true;

	err = hw->mac.ops.reset_hw(hw);

	hw->phy.reset_if_overtemp = false;

	if (err == IXGBE_ERR_SFP_NOT_PRESENT &&

	    hw->mac.type == ixgbe_mac_82598EB) {

	if (err == IXGBE_ERR_SFP_NOT_PRESENT) {

		err = 0;

	} else if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {

		e_dev_err("failed to load because an unsupported SFP+ or QSFP module type was detected.\n");