From ad9e296622adf2cd775c93a94c4ba2756d07e0d5 Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Tue, 25 Aug 2020 11:11:38 +0300 Subject: [PATCH 02/17] netlink: Print and return an error when features weren't changed The legacy ethtool prints an error message and returns 1 if no features were changed as requested. Port this behavior to ethtool-netlink. req_mask is compared to wanted_mask to detect if any feature was changed. If these masks are equal, it means that the kernel hasn't changed anything, and all bits got to wanted. Signed-off-by: Maxim Mikityanskiy Signed-off-by: Michal Kubecek (cherry picked from commit e06cf83352d5161399da49eae7296126cd5e4ea1) --- netlink/features.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/netlink/features.c b/netlink/features.c index 133529da2b9f..762259405acc 100644 --- a/netlink/features.c +++ b/netlink/features.c @@ -243,6 +243,7 @@ int nl_gfeatures(struct cmd_context *ctx) /* FEATURES_SET */ struct sfeatures_context { + bool nothing_changed; uint32_t req_mask[0]; }; @@ -411,10 +412,14 @@ static void show_feature_changes(struct nl_context *nlctx, if (!wanted_val || !wanted_mask || !active_val || !active_mask) goto err; + sfctx->nothing_changed = true; diff = false; - for (i = 0; i < words; i++) + for (i = 0; i < words; i++) { + if (wanted_mask[i] != sfctx->req_mask[i]) + sfctx->nothing_changed = false; if (wanted_mask[i] || (active_mask[i] & ~sfctx->req_mask[i])) diff = true; + } if (!diff) return; @@ -520,6 +525,10 @@ int nl_sfeatures(struct cmd_context *ctx) if (ret < 0) return 92; ret = nlsock_process_reply(nlsk, sfeatures_reply_cb, nlctx); + if (sfctx->nothing_changed) { + fprintf(stderr, "Could not change any device features\n"); + return nlctx->exit_code ?: 1; + } if (ret == 0) return 0; return nlctx->exit_code ?: 92; -- 2.26.2