diff options
| author | Michael Biebl <biebl@debian.org> | 2023-06-28 15:05:47 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2023-06-28 15:05:47 +0200 |
| commit | b63a7cd4dbfe56f832140a2d98bdb67c0a54627f (patch) | |
| tree | 221887ec10314344b54ebc24f8c84fc0e0aaca1a /src/core/devices/team | |
| parent | c5f255c46e327e5b910d5da01d7e00385a8711bc (diff) | |
| parent | 14b0f3a9dc9ea90d60a3b057350fd4d637dc021a (diff) | |
Update upstream source from tag 'upstream/1.42.8'
Update to upstream version '1.42.8' with Debian dir 166b7f033d12a686e3d99ca4b3ded3c6bcbd0f66
Diffstat (limited to 'src/core/devices/team')
| -rw-r--r-- | src/core/devices/team/nm-device-team.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c index 3e3fe52b..5c955986 100644 --- a/src/core/devices/team/nm-device-team.c +++ b/src/core/devices/team/nm-device-team.c @@ -226,24 +226,10 @@ update_connection(NMDevice *device, NMConnection *connection) NMDeviceTeam *self = NM_DEVICE_TEAM(device); NMSettingTeam *s_team = _nm_connection_ensure_setting(connection, NM_TYPE_SETTING_TEAM); NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE(self); - struct teamdctl *tdc = priv->tdc; - GError *error = NULL; /* Read the configuration only if not already set */ - if (!priv->config) { - if (ensure_teamd_connection(device, &error)) { - teamd_read_config(self); - } else { - _LOGD(LOGD_TEAM, "could not connect to teamd: %s", error->message); - g_clear_error(&error); - } - } - - /* Restore previous tdc state */ - if (priv->tdc && !tdc) { - teamdctl_disconnect(priv->tdc); - teamdctl_free(priv->tdc); - priv->tdc = NULL; + if (!priv->config && priv->tdc) { + teamd_read_config(self); } g_object_set(G_OBJECT(s_team), NM_SETTING_TEAM_CONFIG, _get_config(self), NULL); |