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

team: delete port configuration on release

Browse source 
If we set a port configuration upon enslaving, delete it when the port
is released.

https://bugzilla.redhat.com/show_bug.cgi?id=1755406
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/293
This commit is contained in:
Beniamino Galvani 2019-09-27 09:09:32 +02:00
parent 64a9dd3804
commit f868b509fb
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -780,29 +780,27 @@ release_slave (NMDevice *device,
{
NMDeviceTeam *self = NM_DEVICE_TEAM (device);
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (self);
gboolean success;
gboolean do_release, success;
NMSettingTeamPort *s_port;
int ifindex_slave;
int ifindex;
if (configure) {
do_release = configure;
if (do_release) {
ifindex = nm_device_get_ifindex (device);
if ( ifindex <= 0
|| !nm_platform_link_get (nm_device_get_platform (device), ifindex))
configure = FALSE;
do_release = FALSE;
}
ifindex_slave = nm_device_get_ip_ifindex (slave);
if (ifindex_slave <= 0) {
_LOGD (LOGD_TEAM, "team port %s is already released", nm_device_get_ip_iface (slave));
return;
}
if (configure) {
} else if (do_release) {
success = nm_platform_link_release (nm_device_get_platform (device),
nm_device_get_ip_ifindex (device),
ifindex_slave);
if (success)
_LOGI (LOGD_TEAM, "released team port %s", nm_device_get_ip_iface (slave));
else
@ -823,6 +821,13 @@ release_slave (NMDevice *device,
self);
} else
_LOGI (LOGD_TEAM, "team port %s was released", nm_device_get_ip_iface (slave));
/* Delete any port configuration we previously set */
if ( configure
&& priv->tdc
&& (s_port = nm_device_get_applied_setting (slave, NM_TYPE_SETTING_TEAM_PORT))
&& (nm_setting_team_port_get_config (s_port)))
teamdctl_port_config_update_raw (priv->tdc, nm_device_get_ip_iface (slave), "{}");
}
static gboolean