system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-21 10:14:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

device: remove duplicated checks when resetting ethtool settings

Browse source 
`_ethtool_*_reset()` functions already check that the state is not
NULL, no need to check it before. The only exception was for "feature"
settings, where the check was missing.
This commit is contained in:
Beniamino Galvani 2023-10-17 09:25:06 +02:00 committed by Íñigo Huguet
parent 55d31ab11d
commit 48eaee471f
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core/devices/nm-device.c
View file

@ -2385,6 +2385,8 @@ _ethtool_features_reset(NMDevice *self, NMPlatform *platform, EthtoolState *etht
gs_free NMEthtoolFeatureStates *features = NULL;
features = g_steal_pointer(&ethtool_state->features);
if (!features)
return;
if (!nm_platform_ethtool_set_features(platform,
ethtool_state->ifindex,
@ -2404,8 +2406,7 @@ _ethtool_features_set(NMDevice *self,
{
gs_free NMEthtoolFeatureStates *features = NULL;
if (ethtool_state->features)
_ethtool_features_reset(self, platform, ethtool_state);
_ethtool_features_reset(self, platform, ethtool_state);
if (nm_setting_ethtool_init_features(s_ethtool, ethtool_state->requested) == 0)
return;
@ -2719,14 +2720,10 @@ _ethtool_state_reset(NMDevice *self)
if (!ethtool_state)
return;
if (ethtool_state->features)
_ethtool_features_reset(self, platform, ethtool_state);
if (ethtool_state->coalesce)
_ethtool_coalesce_reset(self, platform, ethtool_state);
if (ethtool_state->ring)
_ethtool_ring_reset(self, platform, ethtool_state);
if (ethtool_state->pause)
_ethtool_pause_reset(self, platform, ethtool_state);
_ethtool_features_reset(self, platform, ethtool_state);
_ethtool_coalesce_reset(self, platform, ethtool_state);
_ethtool_ring_reset(self, platform, ethtool_state);
_ethtool_pause_reset(self, platform, ethtool_state);
}
static void