From owner-svn-src-stable-8@FreeBSD.ORG  Mon Jan 24 18:05:49 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5D305106566C;
	Mon, 24 Jan 2011 18:05:49 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C1628FC14;
	Mon, 24 Jan 2011 18:05:49 +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 p0OI5nOL001354;
	Mon, 24 Jan 2011 18:05:49 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0OI5nSj001352;
	Mon, 24 Jan 2011 18:05:49 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201101241805.p0OI5nSj001352@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Mon, 24 Jan 2011 18:05:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217796 - stable/8/sys/dev/ixgbe
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jan 2011 18:05:49 -0000

Author: jfv
Date: Mon Jan 24 18:05:49 2011
New Revision: 217796
URL: http://svn.freebsd.org/changeset/base/217796

Log:
  MFC 217706 Add missing case for 82598DA to phy detect

Modified:
  stable/8/sys/dev/ixgbe/ixgbe.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- stable/8/sys/dev/ixgbe/ixgbe.c	Mon Jan 24 18:03:45 2011	(r217795)
+++ stable/8/sys/dev/ixgbe/ixgbe.c	Mon Jan 24 18:05:49 2011	(r217796)
@@ -2012,6 +2012,9 @@ ixgbe_setup_optics(struct adapter *adapt
 		case IXGBE_PHYSICAL_LAYER_10GBASE_CX4:
 			adapter->optics = IFM_10G_CX4;
 			break;
+		case IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU:
+			adapter->optics = IFM_10G_TWINAX;
+			break;
 		case IXGBE_PHYSICAL_LAYER_1000BASE_KX:
 		case IXGBE_PHYSICAL_LAYER_10GBASE_KR:
 		case IXGBE_PHYSICAL_LAYER_10GBASE_XAUI: