svn commit: r202300 - stable/7/sys/dev/mxge

[Andrew Gallatin]

Author: gallatin
Date: Thu Jan 14 20:58:19 2010
New Revision: 202300
URL: http://svn.freebsd.org/changeset/base/202300

Log:
  MFC 202119: Fix reporting of 10G Twinax media

Modified:
  stable/7/sys/dev/mxge/if_mxge.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mxge/if_mxge.c
==============================================================================
--- stable/7/sys/dev/mxge/if_mxge.c	Thu Jan 14 20:47:49 2010	(r202299)
+++ stable/7/sys/dev/mxge/if_mxge.c	Thu Jan 14 20:58:19 2010	(r202300)
@@ -2588,6 +2588,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"},
@@ -2722,7 +2723,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++) {