diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-21 05:30:28 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-22 04:40:54 +0900 |
commit | 11a288e84652e291b70ead4e2cb2fbfd519668d0 (patch) | |
tree | 2b1d270294a251a88fc9ea4a104dae75274c28a1 /src/shared/ethtool-util.c | |
parent | 05576809194754989f88f83c7104341c35944546 (diff) | |
download | systemd-11a288e84652e291b70ead4e2cb2fbfd519668d0.tar.gz |
ethtool-util: downgrade log level
This just hides issue #19625. It will be fixed in later commits.
Diffstat (limited to 'src/shared/ethtool-util.c')
-rw-r--r-- | src/shared/ethtool-util.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c index 654d36a83a..e6e7da66ae 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -158,15 +158,14 @@ assert_cc((ELEMENTSOF(ethtool_link_mode_bit_table)-1) / 32 < N_ADVERTISE); DEFINE_STRING_TABLE_LOOKUP(ethtool_link_mode_bit, enum ethtool_link_mode_bit_indices); -static int ethtool_connect_or_warn(int *ret, bool warn) { +static int ethtool_connect(int *ret) { int fd; assert_return(ret, -EINVAL); fd = socket_ioctl_fd(); if (fd < 0) - return log_full_errno(warn ? LOG_WARNING: LOG_DEBUG, fd, - "ethtool: could not create control socket: %m"); + return log_debug_errno(fd, "ethtool: could not create control socket: %m"); *ret = fd; @@ -188,7 +187,7 @@ int ethtool_get_driver(int *ethtool_fd, const char *ifname, char **ret) { assert(ret); if (*ethtool_fd < 0) { - r = ethtool_connect_or_warn(ethtool_fd, true); + r = ethtool_connect(ethtool_fd); if (r < 0) return r; } @@ -230,7 +229,7 @@ int ethtool_get_link_info( assert(ifname); if (*ethtool_fd < 0) { - r = ethtool_connect_or_warn(ethtool_fd, false); + r = ethtool_connect(ethtool_fd); if (r < 0) return r; } @@ -282,7 +281,7 @@ int ethtool_get_permanent_macaddr(int *ethtool_fd, const char *ifname, struct et ethtool_fd = &fd; if (*ethtool_fd < 0) { - r = ethtool_connect_or_warn(ethtool_fd, false); + r = ethtool_connect(ethtool_fd); if (r < 0) return r; } @@ -324,7 +323,7 @@ int ethtool_set_speed(int *ethtool_fd, const char *ifname, unsigned speed, Duple return 0; if (*ethtool_fd < 0) { - r = ethtool_connect_or_warn(ethtool_fd, true); + r = ethtool_connect(ethtool_fd); if (r < 0) return r; } @@ -385,7 +384,7 @@ int ethtool_set_wol(int *ethtool_fd, const char *ifname, WakeOnLan wol) { return 0; if (*ethtool_fd < 0) { - r = ethtool_connect_or_warn(ethtool_fd, true); + r = ethtool_connect(ethtool_fd); if (r < 0) return r; } @@ -475,7 +474,7 @@ int ethtool_set_nic_buffer_size(int *ethtool_fd, const char *ifname, const netde assert(ring); if (*ethtool_fd < 0) { - r = ethtool_connect_or_warn(ethtool_fd, true); + r = ethtool_connect(ethtool_fd); if (r < 0) return r; } @@ -608,7 +607,7 @@ int ethtool_set_features(int *ethtool_fd, const char *ifname, const int *feature assert(features); if (*ethtool_fd < 0) { - r = ethtool_connect_or_warn(ethtool_fd, true); + r = ethtool_connect(ethtool_fd); if (r < 0) return r; } @@ -617,7 +616,7 @@ int ethtool_set_features(int *ethtool_fd, const char *ifname, const int *feature r = get_stringset(*ethtool_fd, &ifr, ETH_SS_FEATURES, &strings); if (r < 0) - return log_warning_errno(r, "ethtool: could not get ethtool features for %s", ifname); + return log_debug_errno(r, "ethtool: could not get ethtool features for %s", ifname); sfeatures = alloca0(sizeof(struct ethtool_sfeatures) + DIV_ROUND_UP(strings->len, 32U) * sizeof(sfeatures->features[0])); sfeatures->cmd = ETHTOOL_SFEATURES; @@ -627,7 +626,7 @@ int ethtool_set_features(int *ethtool_fd, const char *ifname, const int *feature if (features[i] != -1) { r = set_features_bit(strings, netdev_feature_table[i], features[i], sfeatures); if (r < 0) { - log_warning_errno(r, "ethtool: could not find feature, ignoring: %s", netdev_feature_table[i]); + log_debug_errno(r, "ethtool: could not find feature, ignoring: %s", netdev_feature_table[i]); continue; } } @@ -636,7 +635,7 @@ int ethtool_set_features(int *ethtool_fd, const char *ifname, const int *feature r = ioctl(*ethtool_fd, SIOCETHTOOL, &ifr); if (r < 0) - return log_warning_errno(r, "ethtool: could not set ethtool features for %s", ifname); + return log_debug_errno(r, "ethtool: could not set ethtool features for %s", ifname); return 0; } @@ -842,12 +841,12 @@ int ethtool_set_glinksettings( assert(advertise); if (autonegotiation != AUTONEG_DISABLE && memeqzero(advertise, sizeof(uint32_t) * N_ADVERTISE)) { - log_info("ethtool: autonegotiation is unset or enabled, the speed and duplex are not writable."); + log_debug("ethtool: autonegotiation is unset or enabled, the speed and duplex are not writable."); return 0; } if (*fd < 0) { - r = ethtool_connect_or_warn(fd, true); + r = ethtool_connect(fd); if (r < 0) return r; } @@ -858,7 +857,7 @@ int ethtool_set_glinksettings( if (r < 0) { r = get_gset(*fd, &ifr, &u); if (r < 0) - return log_warning_errno(r, "ethtool: Cannot get device settings for %s : %m", ifname); + return log_debug_errno(r, "ethtool: Cannot get device settings for %s : %m", ifname); } if (speed > 0) @@ -885,7 +884,7 @@ int ethtool_set_glinksettings( else r = set_sset(*fd, &ifr, u); if (r < 0) - return log_warning_errno(r, "ethtool: Cannot set device settings for %s: %m", ifname); + return log_debug_errno(r, "ethtool: Cannot set device settings for %s: %m", ifname); return r; } @@ -905,7 +904,7 @@ int ethtool_set_channels(int *fd, const char *ifname, const netdev_channels *cha assert(channels); if (*fd < 0) { - r = ethtool_connect_or_warn(fd, true); + r = ethtool_connect(fd); if (r < 0) return r; } @@ -961,7 +960,7 @@ int ethtool_set_flow_control(int *fd, const char *ifname, int rx, int tx, int au assert(ifname); if (*fd < 0) { - r = ethtool_connect_or_warn(fd, true); + r = ethtool_connect(fd); if (r < 0) return r; } |