[v2,ethtool] ethtool: fec: Change the prompt string to adapt to current situations

Commit Message

Simon Horman June 8, 2022, 9:43 a.m. UTC

From: Yu Xiao <[e-mail]>

Majority upstream drivers uses `Configured FEC encodings` to report
supported modes. At which point it is better to change the text in
ethtool user space that changes the meaning of the field, which is
better to suit for the current situations.

So changing `Configured FEC encodings` to `Supported/Configured FEC
encodings` to adapt to both implementations.

Signed-off-by: Yu Xiao <[e-mail]>
Signed-off-by: Simon Horman <[e-mail]>

---
v2: Do not update first parameter to open_json_array.
    This means that the output of the following command
    unchanged by this patch:

    ethtool --json --show-fec $DEV
---
 ethtool.c     | 2 +-
 netlink/fec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

[e-mail] June 13, 2022, 11:20 p.m. UTC | #1

Hello:

This patch was applied to ethtool/ethtool.git (master)
by Michal Kubecek <[e-mail]>:

On Wed,  8 Jun 2022 11:43:12 +0200 you wrote:
> From: Yu Xiao <[e-mail]>
> 
> Majority upstream drivers uses `Configured FEC encodings` to report
> supported modes. At which point it is better to change the text in
> ethtool user space that changes the meaning of the field, which is
> better to suit for the current situations.
> 
> [...]

Here is the summary with links:
  - [v2,ethtool] ethtool: fec: Change the prompt string to adapt to current situations
    https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=2b3ddcb35357

You are awesome, thank you!

Patch

diff --git a/ethtool.c b/ethtool.c
index 277253090245..8654f70de03b 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -5567,7 +5567,7 @@  static int do_gfec(struct cmd_context *ctx)
 	}
 
 	fprintf(stdout, "FEC parameters for %s:\n", ctx->devname);
-	fprintf(stdout, "Configured FEC encodings:");
+	fprintf(stdout, "Supported/Configured FEC encodings:");
 	dump_fec(feccmd.fec);
 	fprintf(stdout, "\n");
 
diff --git a/netlink/fec.c b/netlink/fec.c
index f2659199c157..695724eff896 100644
--- a/netlink/fec.c
+++ b/netlink/fec.c
@@ -153,7 +153,7 @@  int fec_reply_cb(const struct nlmsghdr *nlhdr, void *data)
 	print_string(PRINT_ANY, "ifname", "FEC parameters for %s:\n",
 		     nlctx->devname);
 
-	open_json_array("config", "Configured FEC encodings:");
+	open_json_array("config", "Supported/Configured FEC encodings:");
 	fa = tb[ETHTOOL_A_FEC_AUTO] && mnl_attr_get_u8(tb[ETHTOOL_A_FEC_AUTO]);
 	if (fa)
 		print_string(PRINT_ANY, NULL, " %s", "Auto");