]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udev/net: drop unnecessary conditions
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 21 May 2021 19:23:51 +0000 (04:23 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 23 May 2021 02:40:15 +0000 (11:40 +0900)
src/udev/net/link-config.c

index dc6d437718a6e30791aa0a8e1b62000a0a4c728e..3d2f39f63b0b889d1144982729bca992d1da386f 100644 (file)
@@ -337,23 +337,17 @@ static int link_config_apply_ethtool_settings(int *ethtool_fd, const link_config
         if (r < 0)
                 log_device_warning_errno(device, r, "Could not set offload features, ignoring: %m");
 
-        if (config->channels.rx_count_set || config->channels.tx_count_set || config->channels.other_count_set || config->channels.combined_count_set) {
-                r = ethtool_set_channels(ethtool_fd, name, &config->channels);
-                if (r < 0)
-                        log_device_warning_errno(device, r, "Could not set channels, ignoring: %m");
-        }
+        r = ethtool_set_channels(ethtool_fd, name, &config->channels);
+        if (r < 0)
+                log_device_warning_errno(device, r, "Could not set channels, ignoring: %m");
 
-        if (config->ring.rx_pending_set || config->ring.rx_mini_pending_set || config->ring.rx_jumbo_pending_set || config->ring.tx_pending_set) {
-                r = ethtool_set_nic_buffer_size(ethtool_fd, name, &config->ring);
-                if (r < 0)
-                        log_device_warning_errno(device, r, "Could not set ring buffer, ignoring: %m");
-        }
+        r = ethtool_set_nic_buffer_size(ethtool_fd, name, &config->ring);
+        if (r < 0)
+                log_device_warning_errno(device, r, "Could not set ring buffer, ignoring: %m");
 
-        if (config->rx_flow_control >= 0 || config->tx_flow_control >= 0 || config->autoneg_flow_control >= 0) {
-                r = ethtool_set_flow_control(ethtool_fd, name, config->rx_flow_control, config->tx_flow_control, config->autoneg_flow_control);
-                if (r < 0)
-                        log_device_warning_errno(device, r, "Could not set flow control, ignoring: %m");
-        }
+        r = ethtool_set_flow_control(ethtool_fd, name, config->rx_flow_control, config->tx_flow_control, config->autoneg_flow_control);
+        if (r < 0)
+                log_device_warning_errno(device, r, "Could not set flow control, ignoring: %m");
 
         return 0;
 }