diff options
| author | des <des@FreeBSD.org> | 2013-02-20 21:16:50 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-02-20 21:16:50 +0000 |
| commit | 93c06c0a2162fde8e6523c9ec4915da266c2a6ab (patch) | |
| tree | d0a5152ee7b9a41e5dbb513b64911fd8e0fd7e23 | |
| parent | 4fe522ce7c2313c8285e9200c6c72b0a75322722 (diff) | |
| download | FreeBSD-src-93c06c0a2162fde8e6523c9ec4915da266c2a6ab.zip FreeBSD-src-93c06c0a2162fde8e6523c9ec4915da266c2a6ab.tar.gz | |
revert 247035
| -rw-r--r-- | sys/dev/ixgbe/ixgbe_phy.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c index 4a1e3a1..3f262f9 100644 --- a/sys/dev/ixgbe/ixgbe_phy.c +++ b/sys/dev/ixgbe/ixgbe_phy.c @@ -1194,23 +1194,25 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) /* Make sure we're a supported PHY type */ if (hw->phy.type == ixgbe_phy_sfp_intel) { status = IXGBE_SUCCESS; - } else if (hw->allow_unsupported_sfp == TRUE) { - EWARN(hw, "WARNING: Intel (R) Network " - "Connections are quality tested " - "using Intel (R) Ethernet Optics." - " Using untested modules is not " - "supported and may cause unstable" - " operation or damage to the " - "module or the adapter. Intel " - "Corporation is not responsible " - "for any harm caused by using " - "untested modules.\n", status); - status = IXGBE_SUCCESS; } else { - DEBUGOUT("SFP+ module not supported\n"); - hw->phy.type = - ixgbe_phy_sfp_unsupported; - status = IXGBE_ERR_SFP_NOT_SUPPORTED; + if (hw->allow_unsupported_sfp == TRUE) { + EWARN(hw, "WARNING: Intel (R) Network " + "Connections are quality tested " + "using Intel (R) Ethernet Optics." + " Using untested modules is not " + "supported and may cause unstable" + " operation or damage to the " + "module or the adapter. Intel " + "Corporation is not responsible " + "for any harm caused by using " + "untested modules.\n", status); + status = IXGBE_SUCCESS; + } else { + DEBUGOUT("SFP+ module not supported\n"); + hw->phy.type = + ixgbe_phy_sfp_unsupported; + status = IXGBE_ERR_SFP_NOT_SUPPORTED; + } } } else { status = IXGBE_SUCCESS; |
