From owner-svn-src-all@FreeBSD.ORG  Mon Jan 11 22:08:59 2010
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 7ACCE106566C;
	Mon, 11 Jan 2010 22:08:59 +0000 (UTC)
	(envelope-from gallatin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A8B88FC18;
	Mon, 11 Jan 2010 22:08:59 +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 o0BM8xfw090454;
	Mon, 11 Jan 2010 22:08:59 GMT
	(envelope-from gallatin@svn.freebsd.org)
Received: (from gallatin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0BM8xJs090452;
	Mon, 11 Jan 2010 22:08:59 GMT
	(envelope-from gallatin@svn.freebsd.org)
Message-Id: <201001112208.o0BM8xJs090452@svn.freebsd.org>
From: Andrew Gallatin <gallatin@FreeBSD.org>
Date: Mon, 11 Jan 2010 22:08:59 +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: r202119 - head/sys/dev/mxge
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: Mon, 11 Jan 2010 22:08:59 -0000

Author: gallatin
Date: Mon Jan 11 22:08:59 2010
New Revision: 202119
URL: http://svn.freebsd.org/changeset/base/202119

Log:
  Fix reporting of 10G Twinax media
  
  Reported by: mjacob
  MFC after: 3 days

Modified:
  head/sys/dev/mxge/if_mxge.c

Modified: head/sys/dev/mxge/if_mxge.c
==============================================================================
--- head/sys/dev/mxge/if_mxge.c	Mon Jan 11 21:32:39 2010	(r202118)
+++ head/sys/dev/mxge/if_mxge.c	Mon Jan 11 22:08:59 2010	(r202119)
@@ -2774,6 +2774,7 @@ static struct mxge_media_type mxge_xfp_m
 };
 static struct mxge_media_type mxge_sfp_media_types[] =
 {
+	{IFM_10G_TWINAX,      0,	"10GBASE-Twinax"},
 	{0,		(1 << 7),	"Reserved"},
 	{IFM_10G_LRM,	(1 << 6),	"10GBASE-LRM"},
 	{IFM_10G_LR, 	(1 << 5),	"10GBASE-LR"},
@@ -2908,7 +2909,7 @@ mxge_media_probe(mxge_softc_t *sc)
 		if (mxge_verbose)
 			device_printf(sc->dev, "%s:%s\n", cage_type,
 				      mxge_media_types[0].name);
-		mxge_set_media(sc, IFM_10G_CX4);
+		mxge_set_media(sc, mxge_media_types[0].flag);
 		return;
 	}
 	for (i = 1; i < mxge_media_type_entries; i++) {