Module Name: src
Committed By: msaitoh
Date: Thu Jun 8 02:27:30 UTC 2017
Modified Files:
src/sys/net: if_media.h
Log Message:
- Add some missing baudrate entries
- Add 1000BASE-KX and 2500BASE-KX
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/net/if_media.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_media.h
diff -u src/sys/net/if_media.h:1.58 src/sys/net/if_media.h:1.59
--- src/sys/net/if_media.h:1.58 Mon Jun 5 08:50:07 2017
+++ src/sys/net/if_media.h Thu Jun 8 02:27:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_media.h,v 1.58 2017/06/05 08:50:07 msaitoh Exp $ */
+/* $NetBSD: if_media.h,v 1.59 2017/06/08 02:27:30 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -222,6 +222,8 @@
#define IFM_10G_TWINAX_LONG 24 /* 10GBase Twinax Long copper */
#define IFM_10G_LRM 25 /* 10GBase-LRM 850nm Multi-mode */
#define IFM_10G_T 26 /* 10GBase-T - RJ45 */
+#define IFM_1000_KX 27 /* 1000base-KX backplane */
+#define IFM_2500_KX 28 /* 2500base-KX backplane */
/* IFM_OMASK bits */
#define IFM_ETH_MASTER 0x00000100 /* master mode (1000baseT) */
#define IFM_ETH_RXPAUSE 0x00000200 /* receive PAUSE frames */
@@ -383,11 +385,15 @@ struct ifmedia_description {
{ IFM_ETHER | IFM_1000_CX, "1000CX" }, \
{ IFM_ETHER | IFM_1000_CX, "1000BASE-CX" }, \
{ IFM_ETHER | IFM_1000_BX10, "1000BASE-BX10" }, \
+ { IFM_ETHER | IFM_1000_KX, "1000BASE-KX" }, \
+ { IFM_ETHER | IFM_1000_KX, "1000baseKX" }, \
{ IFM_ETHER | IFM_1000_T, "1000baseT" }, \
{ IFM_ETHER | IFM_1000_T, "1000T" }, \
{ IFM_ETHER | IFM_1000_T, "1000BASE-T" }, \
{ IFM_ETHER | IFM_HPNA_1, "HomePNA1" }, \
{ IFM_ETHER | IFM_HPNA_1, "HPNA1" }, \
+ { IFM_ETHER | IFM_2500_KX, "2500BASE-KX" }, \
+ { IFM_ETHER | IFM_2500_KX, "2500baseKX" }, \
{ IFM_ETHER | IFM_10G_LR, "10GbaseLR" }, \
{ IFM_ETHER | IFM_10G_LR, "10GLR" }, \
{ IFM_ETHER | IFM_10G_LR, "10GBASE-LR" }, \
@@ -536,6 +542,13 @@ 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_1000_BX10, IF_Mbps(1000ULL) }, \
+ { IFM_ETHER | IFM_10G_TWINAX, IF_Gbps(10) }, \
+ { IFM_ETHER | IFM_10G_TWINAX_LONG, IF_Gbps(10) }, \
+ { IFM_ETHER | IFM_10G_LRM, IF_Gbps(10) }, \
+ { IFM_ETHER | IFM_10G_T, IF_Gbps(10) }, \
+ { IFM_ETHER | IFM_1000_KX, IF_Mbps(1000ULL) }, \
+ { IFM_ETHER | IFM_2500_KX, IF_Mbps(2500ULL) }, \
\
{ IFM_TOKEN | IFM_TOK_STP4, IF_Mbps(4) }, \
{ IFM_TOKEN | IFM_TOK_STP16, IF_Mbps(16) }, \
