svn commit: r358628 - stable/12/sys/net

[Konstantin Belousov]

Author: kib
Date: Wed Mar  4 17:21:49 2020
New Revision: 358628
URL: https://svnweb.freebsd.org/changeset/base/358628

Log:
  MFC r357765:
  if_media.h: Add 50G KR4 ethernet media type.

Modified:
  stable/12/sys/net/ieee8023ad_lacp.c
  stable/12/sys/net/if_media.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/net/ieee8023ad_lacp.c
==============================================================================
--- stable/12/sys/net/ieee8023ad_lacp.c	Wed Mar  4 17:19:25 2020	(r358627)
+++ stable/12/sys/net/ieee8023ad_lacp.c	Wed Mar  4 17:21:49 2020	(r358628)
@@ -1153,6 +1153,7 @@ lacp_compose_key(struct lacp_port *lp)
 		case IFM_50G_PCIE:
 		case IFM_50G_CR2:
 		case IFM_50G_KR2:
+		case IFM_50G_KR4:
 		case IFM_50G_SR2:
 		case IFM_50G_LR2:
 		case IFM_50G_LAUI2_AC:

Modified: stable/12/sys/net/if_media.h
==============================================================================
--- stable/12/sys/net/if_media.h	Wed Mar  4 17:19:25 2020	(r358627)
+++ stable/12/sys/net/if_media.h	Wed Mar  4 17:21:49 2020	(r358628)
@@ -258,6 +258,7 @@ uint64_t	ifmedia_baudrate(int);
 #define	IFM_400G_DR4	IFM_X(115)	/* 400GBase-DR4 */
 #define	IFM_400G_AUI8_AC IFM_X(116)	/* 400G-AUI8 active copper/optical */
 #define	IFM_400G_AUI8	IFM_X(117)	/* 400G-AUI8 */
+#define	IFM_50G_KR4	IFM_X(118)	/* 50GBase-KR4 */
 
 /*
  * Please update ieee8023ad_lacp.c:lacp_compose_key()
@@ -484,6 +485,7 @@ struct ifmedia_description {
 	{ IFM_25G_SR,	"25GBase-SR" },					\
 	{ IFM_50G_CR2,	"50GBase-CR2" },				\
 	{ IFM_50G_KR2,	"50GBase-KR2" },				\
+	{ IFM_50G_KR4,	"50GBase-KR4" },				\
 	{ IFM_25G_LR,	"25GBase-LR" },					\
 	{ IFM_10G_AOC,	"10GBase-AOC" },				\
 	{ IFM_25G_ACC,	"25GBase-ACC" },				\
@@ -827,6 +829,7 @@ struct ifmedia_baudrate {
 	{ IFM_ETHER | IFM_25G_SR,	IF_Gbps(25ULL) },		\
 	{ IFM_ETHER | IFM_50G_CR2,	IF_Gbps(50ULL) },		\
 	{ IFM_ETHER | IFM_50G_KR2,	IF_Gbps(50ULL) },		\
+	{ IFM_ETHER | IFM_50G_KR4,	IF_Gbps(50ULL) },		\
 	{ IFM_ETHER | IFM_25G_LR,	IF_Gbps(25ULL) },		\
 	{ IFM_ETHER | IFM_10G_AOC,	IF_Gbps(10ULL) },		\
 	{ IFM_ETHER | IFM_25G_ACC,	IF_Gbps(25ULL) },		\