diff options
| author | Michal Kubecek <mkubecek@suse.cz> | 2020-09-28 17:03:27 +0200 |
|---|---|---|
| committer | Michal Kubecek <mkubecek@suse.cz> | 2020-09-28 17:18:23 +0200 |
| commit | f85cb14f54cb10f219a02cab2f56b4877767be13 (patch) | |
| tree | af616a26601a98793281bd37df7dcfc0d7ae4973 | |
| parent | 0cd0742eab2edd702306da79ddee48644ebe0c9a (diff) | |
| download | ethtool-f85cb14f54cb10f219a02cab2f56b4877767be13.tar.gz | |
add 100baseFX modes to link mode tables
Update tables of link modes with 100baseFX/Half and 100baseFX/Full:
- link_modes[] array in netlink/settings.c
- all_advertised_modes_bits[] and mode_defs[] arrays in ethtool.c
- table of modes and corresponding bit values in manual page
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
| -rw-r--r-- | ethtool.8.in | 2 | ||||
| -rw-r--r-- | ethtool.c | 6 | ||||
| -rw-r--r-- | netlink/settings.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/ethtool.8.in b/ethtool.8.in index d092194..f70edb5 100644 --- a/ethtool.8.in +++ b/ethtool.8.in @@ -722,6 +722,8 @@ lB l lB. 0x004 100baseT Half 0x008 100baseT Full 0x80000000000000000 100baseT1 Full +0x40000000000000000000000 100baseFX Half +0x80000000000000000000000 100baseFX Full 0x010 1000baseT Half (not supported by IEEE standards) 0x020 1000baseT Full 0x20000 1000baseKX Full @@ -463,6 +463,8 @@ static void init_global_link_mode_masks(void) ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT, ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT, ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT, + ETHTOOL_LINK_MODE_100baseFX_Half_BIT, + ETHTOOL_LINK_MODE_100baseFX_Full_BIT, }; static const enum ethtool_link_mode_bit_indices additional_advertised_flags_bits[] = { @@ -699,6 +701,10 @@ static void dump_link_caps(const char *prefix, const char *an_prefix, "400000baseDR4/Full" }, { 0, ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT, "400000baseCR4/Full" }, + { 0, ETHTOOL_LINK_MODE_100baseFX_Half_BIT, + "100baseFX/Half" }, + { 1, ETHTOOL_LINK_MODE_100baseFX_Full_BIT, + "100baseFX/Full" }, }; int indent; int did1, new_line_pend; diff --git a/netlink/settings.c b/netlink/settings.c index 3059d4d..41a2e5a 100644 --- a/netlink/settings.c +++ b/netlink/settings.c @@ -162,6 +162,8 @@ static const struct link_mode_info link_modes[] = { [ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT] = __REAL(400000), [ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT] = __REAL(400000), [ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT] = __REAL(400000), + [ETHTOOL_LINK_MODE_100baseFX_Half_BIT] = __HALF_DUPLEX(100), + [ETHTOOL_LINK_MODE_100baseFX_Full_BIT] = __REAL(100), }; const unsigned int link_modes_count = ARRAY_SIZE(link_modes); |