svn commit: r186260 - head/sys/net

[George V. Neville-Neil]

Author: gnn
Date: Wed Dec 17 22:59:29 2008
New Revision: 186260
URL: http://svn.freebsd.org/changeset/base/186260

Log:
  Add TWINAX (Twin Axial Copper for 10G networking) media types.
  
  Add code to the Chelsio driver so that it can recognize different
  module types which may be plugged into it, including SR, LR lasers
  and TWINAX copper cables.
  
  Obtained from:	Chelsio Inc.
  MFC after:	1 week

Modified:
  head/sys/net/if_media.h

Modified: head/sys/net/if_media.h
==============================================================================
--- head/sys/net/if_media.h	Wed Dec 17 22:07:44 2008	(r186259)
+++ head/sys/net/if_media.h	Wed Dec 17 22:59:29 2008	(r186260)
@@ -145,6 +145,11 @@ uint64_t	ifmedia_baudrate(int);
 #define	IFM_10G_SR	19		/* 10GBase-SR 850nm Multi-mode */
 #define	IFM_10G_CX4	20		/* 10GBase CX4 copper */
 #define IFM_2500_SX	21		/* 2500BaseSX - multi-mode fiber */
+#define IFM_10G_TWINAX 22   /* 10GBase Twinax copper */
+#define IFM_10G_TWINAX_LONG 23 /* 10GBase Twinax Long copper */
+#define IFM_10G_LRM 24      /* 10GBase-LRM 850nm Multi-mode */
+#define IFM_UNKNOWN 25      /* New media types that have not been defined yet */
+
 
 /* note 31 is the max! */
 
@@ -349,6 +354,10 @@ struct ifmedia_description {
 	{ IFM_10G_SR,	"10Gbase-SR" },					\
 	{ IFM_10G_CX4,	"10Gbase-CX4" },				\
 	{ IFM_2500_SX,	"2500BaseSX" },					\
+	{ IFM_10G_LRM,  "10Gbase-LRM" },                \
+	{ IFM_10G_TWINAX,   "10Gbase-Twinax" },         \
+	{ IFM_10G_TWINAX_LONG, "10Gbase-Twinax-Long" }, \
+	{ IFM_UNKNOWN,  "Unknown" },                    \
 	{ 0, NULL },							\
 }
 
@@ -603,6 +612,9 @@ struct ifmedia_baudrate {
 	{ IFM_ETHER | IFM_10G_SR,	IF_Gbps(10ULL) },		\
 	{ IFM_ETHER | IFM_10G_CX4,	IF_Gbps(10ULL) },		\
 	{ IFM_ETHER | IFM_2500_SX,	IF_Mbps(2500ULL) },		\
+	{ IFM_ETHER | IFM_10G_TWINAX,	IF_Gbps(10ULL) },		\
+	{ IFM_ETHER | IFM_10G_TWINAX_LONG,	IF_Gbps(10ULL) },		\
+	{ IFM_ETHER | IFM_10G_LRM,	IF_Gbps(10ULL) },		\
 									\
 	{ IFM_TOKEN | IFM_TOK_STP4,	IF_Mbps(4) },			\
 	{ IFM_TOKEN | IFM_TOK_STP16,	IF_Mbps(16) },			\