fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 08:00:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bonding: abort activation of unknown slave types

Browse source 
Abort activation of slaves which are unknown and log successful
enslave/release.

Signed-off-by: Thomas Graf <tgraf@redhat.com>
This commit is contained in:
Thomas Graf 2011-12-07 13:15:22 +01:00 • committed by Dan Williams
parent 200a7e142a
commit 916631f15a
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/nm-device.c
View file

@ -899,8 +899,18 @@ handle_slave_activation (NMDevice *slave, NMDevice *master)
return FALSE;
nm_device_hw_bring_up (slave, TRUE, NULL);
} else {
nm_log_warn (LOGD_DEVICE, "(%s): Unable to enslave. Unknown slave type '%s'",
nm_device_get_iface (slave), nm_setting_connection_get_slave_type (s_con));
/* Abort activation */
return FALSE;
}
nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 1 of 5 (Device Prepare) enslaved to %s",
nm_device_get_iface (slave),
nm_device_get_iface (master));
return TRUE;
}
@ -916,8 +926,11 @@ handle_slave_deactivation (NMDevice *slave, NMDevice *master)
s_con = nm_connection_get_setting_connection (connection);
g_assert (s_con);
if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME))
if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME)) {
nm_system_iface_release (slave, master);
nm_log_info (LOGD_DEVICE, "Device %s released from master %s",
nm_device_get_iface (slave), nm_device_get_iface (master));
}
}
/*