[ethtool-next,v4,02/16] ethtool: Standardize Link Length field names across module types

Commit Message

Danielle Ratson Feb. 5, 2025, 3:54 p.m. UTC

The 'Link Length' fields have inconsistent naming across different
module types.

To ensure consistency, especially with the upcoming JSON support for the
EEPROM dump, these field names should be aligned.

Standardize the Link Length fields across all module types.

Signed-off-by: Danielle Ratson <[e-mail]>
---

Notes:
    v3:
    	* New patch.

 cmis.c  |  4 ++--
 qsfp.c  |  8 ++++----
 sfpid.c | 11 ++++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

Patch

diff --git a/cmis.c b/cmis.c
index 71f0745..5efafca 100644
--- a/cmis.c
+++ b/cmis.c
@@ -282,9 +282,9 @@  static void cmis_show_link_len(const struct cmis_memory_map *map)
 	module_show_value_with_unit(map->page_01h, CMIS_OM4_LEN_OFFSET,
 				    "Length (OM4)", 2, "m");
 	module_show_value_with_unit(map->page_01h, CMIS_OM3_LEN_OFFSET,
-				    "Length (OM3 50/125um)", 2, "m");
+				    "Length (OM3)", 2, "m");
 	module_show_value_with_unit(map->page_01h, CMIS_OM2_LEN_OFFSET,
-				    "Length (OM2 50/125um)", 1, "m");
+				    "Length (OM2)", 1, "m");
 }
 
 /**
diff --git a/qsfp.c b/qsfp.c
index 6d774f8..1aa75fd 100644
--- a/qsfp.c
+++ b/qsfp.c
@@ -736,13 +736,13 @@  static void sff8636_show_page_zero(const struct sff8636_memory_map *map)
 				    "BR, Nominal", 100, "Mbps");
 	sff8636_show_rate_identifier(map);
 	module_show_value_with_unit(map->page_00h, SFF8636_SM_LEN_OFFSET,
-				    "Length (SMF,km)", 1, "km");
+				    "Length (SMF)", 1, "km");
 	module_show_value_with_unit(map->page_00h, SFF8636_OM3_LEN_OFFSET,
-				    "Length (OM3 50um)", 2, "m");
+				    "Length (OM3)", 2, "m");
 	module_show_value_with_unit(map->page_00h, SFF8636_OM2_LEN_OFFSET,
-				    "Length (OM2 50um)", 1, "m");
+				    "Length (OM2)", 1, "m");
 	module_show_value_with_unit(map->page_00h, SFF8636_OM1_LEN_OFFSET,
-				    "Length (OM1 62.5um)", 1, "m");
+				    "Length (OM1)", 1, "m");
 	module_show_value_with_unit(map->page_00h, SFF8636_CBL_LEN_OFFSET,
 				    "Length (Copper or Active cable)", 1, "m");
 	sff8636_show_wavelength_or_copper_compliance(map);
diff --git a/sfpid.c b/sfpid.c
index 459ed0b..d128f48 100644
--- a/sfpid.c
+++ b/sfpid.c
@@ -395,11 +395,12 @@  static void sff8079_show_all_common(const __u8 *id)
 		sff8079_show_encoding(id);
 		printf("\t%-41s : %u%s\n", "BR, Nominal", br_nom, "MBd");
 		sff8079_show_rate_identifier(id);
-		module_show_value_with_unit(id, 14, "Length (SMF,km)", 1, "km");
-		module_show_value_with_unit(id, 15, "Length (SMF)", 100, "m");
-		module_show_value_with_unit(id, 16, "Length (50um)", 10, "m");
-		module_show_value_with_unit(id, 17, "Length (62.5um)", 10, "m");
-		module_show_value_with_unit(id, 18, "Length (Copper)", 1, "m");
+		module_show_value_with_unit(id, 14, "Length (SMF)", 1, "km");
+		module_show_value_with_unit(id, 16, "Length (OM2)", 10, "m");
+		module_show_value_with_unit(id, 17, "Length (OM1)", 10, "m");
+		module_show_value_with_unit(id, 18,
+					    "Length (Copper or Active cable)",
+					    1, "m");
 		module_show_value_with_unit(id, 19, "Length (OM3)", 10, "m");
 		sff8079_show_wavelength_or_copper_compliance(id);
 		module_show_ascii(id, 20, 35, "Vendor name");