diff options
author | Michal Kubecek <mkubecek@suse.cz> | 2022-12-20 17:59:38 +0100 |
---|---|---|
committer | Michal Kubecek <mkubecek@suse.cz> | 2022-12-20 17:59:38 +0100 |
commit | 0da165ab4c1da658fee31597a71dd568515c92c3 (patch) | |
tree | 5d5403767a42c1b767eef43d0a90e8cbeb87784f | |
parent | 8cee2091ae2af58a82abee9a656fcf7c04ebdefc (diff) | |
download | ethtool-0da165ab4c1da658fee31597a71dd568515c92c3.tar.gz |
add 800Gb/s modes to link mode tables
Add recently added 800000base link modes to man page and ioctl and fallback
code paths.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
-rw-r--r-- | ethtool.8.in | 6 | ||||
-rw-r--r-- | ethtool.c | 18 | ||||
-rw-r--r-- | netlink/settings.c | 6 |
3 files changed, 30 insertions, 0 deletions
diff --git a/ethtool.8.in b/ethtool.8.in index bee47f2..e13229b 100644 --- a/ethtool.8.in +++ b/ethtool.8.in @@ -853,6 +853,12 @@ lB l lB. 0x8000000000000000000000 400000baseLR4_ER4_FR4 Full 0x10000000000000000000000 400000baseDR4 Full 0x20000000000000000000000 400000baseCR4 Full +0x200000000000000000000000 800000baseCR8 Full +0x400000000000000000000000 800000baseKR8 Full +0x800000000000000000000000 800000baseDR8 Full +0x1000000000000000000000000 800000baseDR8_2 Full +0x2000000000000000000000000 800000baseSR8 Full +0x4000000000000000000000000 800000baseVR8 Full .TE .TP .BI phyad \ N @@ -478,6 +478,12 @@ static void init_global_link_mode_masks(void) ETHTOOL_LINK_MODE_100baseFX_Half_BIT, ETHTOOL_LINK_MODE_100baseFX_Full_BIT, ETHTOOL_LINK_MODE_10baseT1L_Full_BIT, + ETHTOOL_LINK_MODE_800000baseCR8_Full_BIT, + ETHTOOL_LINK_MODE_800000baseKR8_Full_BIT, + ETHTOOL_LINK_MODE_800000baseDR8_Full_BIT, + ETHTOOL_LINK_MODE_800000baseDR8_2_Full_BIT, + ETHTOOL_LINK_MODE_800000baseSR8_Full_BIT, + ETHTOOL_LINK_MODE_800000baseVR8_Full_BIT, }; static const enum ethtool_link_mode_bit_indices additional_advertised_flags_bits[] = { @@ -720,6 +726,18 @@ static void dump_link_caps(const char *prefix, const char *an_prefix, "100baseFX/Full" }, { 0, ETHTOOL_LINK_MODE_10baseT1L_Full_BIT, "10baseT1L/Full" }, + { 0, ETHTOOL_LINK_MODE_800000baseCR8_Full_BIT, + "800000baseCR8/Full" }, + { 0, ETHTOOL_LINK_MODE_800000baseKR8_Full_BIT, + "800000baseKR8/Full" }, + { 0, ETHTOOL_LINK_MODE_800000baseDR8_Full_BIT, + "800000baseDR8/Full" }, + { 0, ETHTOOL_LINK_MODE_800000baseDR8_2_Full_BIT, + "800000baseDR8_2/Full" }, + { 0, ETHTOOL_LINK_MODE_800000baseSR8_Full_BIT, + "800000baseSR8/Full" }, + { 0, ETHTOOL_LINK_MODE_800000baseVR8_Full_BIT, + "800000baseVR8/Full" }, }; int indent; int did1, new_line_pend; diff --git a/netlink/settings.c b/netlink/settings.c index 14ad0b4..f96f324 100644 --- a/netlink/settings.c +++ b/netlink/settings.c @@ -166,6 +166,12 @@ static const struct link_mode_info link_modes[] = { [ETHTOOL_LINK_MODE_100baseFX_Half_BIT] = __HALF_DUPLEX(100), [ETHTOOL_LINK_MODE_100baseFX_Full_BIT] = __REAL(100), [ETHTOOL_LINK_MODE_10baseT1L_Full_BIT] = __REAL(10), + [ETHTOOL_LINK_MODE_800000baseCR8_Full_BIT] = __REAL(800000), + [ETHTOOL_LINK_MODE_800000baseKR8_Full_BIT] = __REAL(800000), + [ETHTOOL_LINK_MODE_800000baseDR8_Full_BIT] = __REAL(800000), + [ETHTOOL_LINK_MODE_800000baseDR8_2_Full_BIT] = __REAL(800000), + [ETHTOOL_LINK_MODE_800000baseSR8_Full_BIT] = __REAL(800000), + [ETHTOOL_LINK_MODE_800000baseVR8_Full_BIT] = __REAL(800000), }; const unsigned int link_modes_count = ARRAY_SIZE(link_modes); |