From c2f2250e5c52ec3745a462e3f55a94c133786df8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 17 Aug 2021 00:44:00 +0900 Subject: [PATCH] ethtool: make ethtool_set_features() return earlier when nothing is requested --- src/shared/ethtool-util.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c index 699c7a97ab9..4ca90615f3c 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -505,12 +505,22 @@ int ethtool_set_features(int *ethtool_fd, const char *ifname, const int features _cleanup_free_ struct ethtool_gstrings *strings = NULL; struct ethtool_sfeatures *sfeatures; struct ifreq ifr = {}; - int i, r; + bool have = false; + int r; assert(ethtool_fd); assert(ifname); assert(features); + for (size_t i = 0; i < _NET_DEV_FEAT_MAX; i++) + if (features[i] >= 0) { + have = true; + break; + } + + if (!have) + return 0; + r = ethtool_connect(ethtool_fd); if (r < 0) return r; @@ -525,8 +535,8 @@ int ethtool_set_features(int *ethtool_fd, const char *ifname, const int features sfeatures->cmd = ETHTOOL_SFEATURES; sfeatures->size = DIV_ROUND_UP(strings->len, 32U); - for (i = 0; i < _NET_DEV_FEAT_MAX; i++) - if (features[i] != -1) { + for (size_t i = 0; i < _NET_DEV_FEAT_MAX; i++) + if (features[i] >= 0) { r = set_features_bit(strings, netdev_feature_table[i], features[i], sfeatures); if (r < 0) { log_debug_errno(r, "ethtool: could not find feature, ignoring: %s", netdev_feature_table[i]); -- 2.47.3