From owner-svn-src-all@FreeBSD.ORG  Wed Feb 20 21:16:51 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4D80CDA2;
 Wed, 20 Feb 2013 21:16:51 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4015C78D;
 Wed, 20 Feb 2013 21:16:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1KLGpFa032887;
 Wed, 20 Feb 2013 21:16:51 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1KLGpq3032886;
 Wed, 20 Feb 2013 21:16:51 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201302202116.r1KLGpq3032886@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 20 Feb 2013 21:16:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247056 - head/sys/dev/ixgbe
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Feb 2013 21:16:51 -0000

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;