fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 11:58:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: don't return error from release_slave()

Browse source 
release_slave() should do the right thing and handle errors as
good as it can. There is no value in propagating the error and
it's not clear what the caller should do in face of a failure
during release.
This commit is contained in:
Thomas Haller 2015-12-02 09:56:17 +01:00
parent a39dc1cd4b
commit e7a8607695
5 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/devices/nm-device-bond.c
View file

@ -419,13 +419,13 @@ enslave_slave (NMDevice *device,
return TRUE; return TRUE;
} }
static gboolean static void
release_slave (NMDevice *device, release_slave (NMDevice *device,
NMDevice *slave, NMDevice *slave,
gboolean configure) gboolean configure)
{ {
NMDeviceBond *self = NM_DEVICE_BOND (device); NMDeviceBond *self = NM_DEVICE_BOND (device);
gboolean success = TRUE, no_firmware = FALSE; gboolean success, no_firmware = FALSE;
if (configure) { if (configure) {
success = nm_platform_link_release (NM_PLATFORM_GET, success = nm_platform_link_release (NM_PLATFORM_GET,
@ -444,7 +444,6 @@ release_slave (NMDevice *device,
nm_device_get_ip_iface (slave)); nm_device_get_ip_iface (slave));
} }
if (success)
g_object_notify (G_OBJECT (device), NM_DEVICE_BOND_SLAVES); g_object_notify (G_OBJECT (device), NM_DEVICE_BOND_SLAVES);
if (configure) { if (configure) {
@ -455,8 +454,6 @@ release_slave (NMDevice *device,
if (!nm_device_bring_up (slave, TRUE, &no_firmware)) if (!nm_device_bring_up (slave, TRUE, &no_firmware))
_LOGW (LOGD_BOND, "released bond slave could not be brought up."); _LOGW (LOGD_BOND, "released bond slave could not be brought up.");
} }
return success;
} }
static gboolean static gboolean

5
src/devices/nm-device-bridge.c
View file

@ -356,13 +356,13 @@ enslave_slave (NMDevice *device,
return TRUE; return TRUE;
} }
static gboolean static void
release_slave (NMDevice *device, release_slave (NMDevice *device,
NMDevice *slave, NMDevice *slave,
gboolean configure) gboolean configure)
{ {
NMDeviceBridge *self = NM_DEVICE_BRIDGE (device); NMDeviceBridge *self = NM_DEVICE_BRIDGE (device);
gboolean success = TRUE; gboolean success;
if (configure) { if (configure) {
success = nm_platform_link_release (NM_PLATFORM_GET, success = nm_platform_link_release (NM_PLATFORM_GET,
@ -382,7 +382,6 @@ release_slave (NMDevice *device,
} }
g_object_notify (G_OBJECT (device), NM_DEVICE_BRIDGE_SLAVES); g_object_notify (G_OBJECT (device), NM_DEVICE_BRIDGE_SLAVES);
return success;
} }
static gboolean static gboolean

8
src/devices/nm-device.c
View file

@ -1123,12 +1123,8 @@ nm_device_master_release_one_slave (NMDevice *self, NMDevice *slave, gboolean co
return FALSE; return FALSE;
priv->slaves = g_slist_remove (priv->slaves, info); priv->slaves = g_slist_remove (priv->slaves, info);
if (info->slave_is_enslaved) { if (info->slave_is_enslaved)
success = NM_DEVICE_GET_CLASS (self)->release_slave (self, slave, configure); NM_DEVICE_GET_CLASS (self)->release_slave (self, slave, configure);
/* The release_slave() implementation logs success/failure (in the
* correct device-specific log domain), so we don't have to do anything.
*/
}
nm_device_slave_notify_release (info->slave, reason); nm_device_slave_notify_release (info->slave, reason);

2
src/devices/nm-device.h
View file

@ -308,7 +308,7 @@ typedef struct {
NMConnection *connection, NMConnection *connection,
gboolean configure); gboolean configure);
gboolean (* release_slave) (NMDevice *self, void (* release_slave) (NMDevice *self,
NMDevice *slave, NMDevice *slave,
gboolean configure); gboolean configure);

7
src/devices/team/nm-device-team.c
View file

@ -649,13 +649,13 @@ enslave_slave (NMDevice *device,
return TRUE; return TRUE;
} }
static gboolean static void
release_slave (NMDevice *device, release_slave (NMDevice *device,
NMDevice *slave, NMDevice *slave,
gboolean configure) gboolean configure)
{ {
NMDeviceTeam *self = NM_DEVICE_TEAM (device); NMDeviceTeam *self = NM_DEVICE_TEAM (device);
gboolean success = TRUE, no_firmware = FALSE; gboolean success, no_firmware = FALSE;
if (configure) { if (configure) {
success = nm_platform_link_release (NM_PLATFORM_GET, success = nm_platform_link_release (NM_PLATFORM_GET,
@ -669,7 +669,6 @@ release_slave (NMDevice *device,
} else } else
_LOGI (LOGD_TEAM, "team port %s was released", nm_device_get_ip_iface (slave)); _LOGI (LOGD_TEAM, "team port %s was released", nm_device_get_ip_iface (slave));
if (success)
g_object_notify (G_OBJECT (device), NM_DEVICE_TEAM_SLAVES); g_object_notify (G_OBJECT (device), NM_DEVICE_TEAM_SLAVES);
if (configure) { if (configure) {
@ -681,8 +680,6 @@ release_slave (NMDevice *device,
_LOGW (LOGD_TEAM, "released team port %s could not be brought up", _LOGW (LOGD_TEAM, "released team port %s could not be brought up",
nm_device_get_ip_iface (slave)); nm_device_get_ip_iface (slave));
} }
return success;
} }
static gboolean static gboolean