From owner-svn-src-all@FreeBSD.ORG  Fri Nov 13 00:31:51 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79D59106566C;
	Fri, 13 Nov 2009 00:31:51 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 690418FC0A;
	Fri, 13 Nov 2009 00:31:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAD0Vpaa048191;
	Fri, 13 Nov 2009 00:31:51 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAD0VpH6048189;
	Fri, 13 Nov 2009 00:31:51 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <200911130031.nAD0VpH6048189@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Fri, 13 Nov 2009 00:31:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199238 - head/sys/dev/cxgb/common
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 13 Nov 2009 00:31:51 -0000

Author: np
Date: Fri Nov 13 00:31:51 2009
New Revision: 199238
URL: http://svn.freebsd.org/changeset/base/199238

Log:
  Make sure *some* edc is setup even for an unknown transceiver (assume
  it is optical).

Modified:
  head/sys/dev/cxgb/common/cxgb_ael1002.c

Modified: head/sys/dev/cxgb/common/cxgb_ael1002.c
==============================================================================
--- head/sys/dev/cxgb/common/cxgb_ael1002.c	Fri Nov 13 00:28:16 2009	(r199237)
+++ head/sys/dev/cxgb/common/cxgb_ael1002.c	Fri Nov 13 00:31:51 2009	(r199238)
@@ -1270,7 +1270,7 @@ static int ael2005_reset(struct cphy *ph
 		return err;
 	phy->modtype = (u8)err;
 
-	if (err == phy_modtype_none || err == phy_modtype_unknown)
+	if (err == phy_modtype_none)
 		err = 0;
 	else if (err == phy_modtype_twinax || err == phy_modtype_twinax_long)
 		err = ael2005_setup_twinax_edc(phy, err);
@@ -1981,7 +1981,7 @@ static int ael2020_reset(struct cphy *ph
 	if (err < 0)
 		return err;
 	phy->modtype = (u8)err;
-	if (err == phy_modtype_none || err == phy_modtype_unknown)
+	if (err == phy_modtype_none)
 		err = 0;
 	else if (err == phy_modtype_twinax || err == phy_modtype_twinax_long)
 		err = ael2020_setup_twinax_edc(phy, err);