SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ethtool: make ethtool_set_features() return earlier when nothing is requested

Browse Source
This commit is contained in:
Yu Watanabe
2021-08-17 00:49:01 +09:00
parent 0db68800c7
commit c2f2250e5c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/ethtool-util.c
+13 -3
View File
@@ -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]);