diff options
| author | Mark Rustad | 2015-08-09 01:17:46 +0200 |
|---|---|---|
| committer | Jeff Kirsher | 2015-09-23 00:58:29 +0200 |
| commit | 29a8dca1997f880563e53e9ba0fcb50b03bd23af (patch) | |
| tree | f5e00154a9f8f742a5c4706f1592f12a9fbee3a1 /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |
| parent | ixgbevf: Enables TSO for stacked VLAN (diff) | |
| download | kernel-qcow2-linux-29a8dca1997f880563e53e9ba0fcb50b03bd23af.tar.gz kernel-qcow2-linux-29a8dca1997f880563e53e9ba0fcb50b03bd23af.tar.xz kernel-qcow2-linux-29a8dca1997f880563e53e9ba0fcb50b03bd23af.zip | |
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: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 5f04ad42fec4..c53bef63f921 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -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"); |