svn commit: r247056 - head/sys/dev/ixgbe

[Dag-Erling Smørgrav]

Author: des
Date: Wed Feb 20 21:16:50 2013
New Revision: 247056
URL: http://svnweb.freebsd.org/changeset/base/247056

Log:
  revert 247035

Modified:
  head/sys/dev/ixgbe/ixgbe_phy.c

Modified: head/sys/dev/ixgbe/ixgbe_phy.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe_phy.c	Wed Feb 20 20:56:07 2013	(r247055)
+++ head/sys/dev/ixgbe/ixgbe_phy.c	Wed Feb 20 21:16:50 2013	(r247056)
@@ -1194,23 +1194,25 @@ s32 ixgbe_identify_sfp_module_generic(st
 			/* 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;