Merge tag 'for-6.3/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/devic...

[linux-block.git] / net / ethtool / common.c

diff --git a/net/ethtool/common.c b/net/ethtool/common.c
index 6f399afc2ff2aa83fe91a5505428cc2808cd2c89..5fb19050991e06229466f146956cf84b21cb6140 100644 (file)
--- a/net/ethtool/common.c
+++ b/net/ethtool/common.c
@@ -208,6 +208,9 @@ const char link_mode_names[][ETH_GSTRING_LEN] = {
        __DEFINE_LINK_MODE_NAME(800000, DR8_2, Full),
        __DEFINE_LINK_MODE_NAME(800000, SR8, Full),
        __DEFINE_LINK_MODE_NAME(800000, VR8, Full),
+       __DEFINE_LINK_MODE_NAME(10, T1S, Full),
+       __DEFINE_LINK_MODE_NAME(10, T1S, Half),
+       __DEFINE_LINK_MODE_NAME(10, T1S_P2MP, Half),
 };
 static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS);
 
@@ -244,6 +247,8 @@ static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS);
 #define __LINK_MODE_LANES_X            1
 #define __LINK_MODE_LANES_FX           1
 #define __LINK_MODE_LANES_T1L          1
+#define __LINK_MODE_LANES_T1S          1
+#define __LINK_MODE_LANES_T1S_P2MP     1
 #define __LINK_MODE_LANES_VR8          8
 #define __LINK_MODE_LANES_DR8_2                8
 
@@ -366,6 +371,9 @@ const struct link_mode_info link_mode_params[] = {
        __DEFINE_LINK_MODE_PARAMS(800000, DR8_2, Full),
        __DEFINE_LINK_MODE_PARAMS(800000, SR8, Full),
        __DEFINE_LINK_MODE_PARAMS(800000, VR8, Full),
+       __DEFINE_LINK_MODE_PARAMS(10, T1S, Full),
+       __DEFINE_LINK_MODE_PARAMS(10, T1S, Half),
+       __DEFINE_LINK_MODE_PARAMS(10, T1S_P2MP, Half),
 };
 static_assert(ARRAY_SIZE(link_mode_params) == __ETHTOOL_LINK_MODE_MASK_NBITS);