diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-04-14 10:40:42 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-04-16 15:18:26 +0200 |
| commit | b0d45c88c31c09914ed84f629d176d9f7dd0ef48 (patch) | |
| tree | 8b31a603e7341748135ff67381a5170b679e91d4 | |
| parent | e4537e9021ff4733ad046aaf170f73d8eff7d998 (diff) | |
| download | NetworkManager-b0d45c88c31c09914ed84f629d176d9f7dd0ef48.tar.gz | |
device: don't restart LLDP listener in nm_device_update_dynamic_ip_setup()
It's not clear why we would need to restart the instance. It
is supposed to work, and recover automatically.
The only thing that restarting should be necessary, is to change the
ifindex. But this is not the right place for handling changes of ifindex.
| -rw-r--r-- | src/core/devices/nm-device.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index b8a53bff0a..7ca03936fb 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -4903,7 +4903,6 @@ void nm_device_update_dynamic_ip_setup(NMDevice *self) { NMDevicePrivate *priv; - GError * error = NULL; g_return_if_fail(NM_IS_DEVICE(self)); @@ -4936,19 +4935,6 @@ nm_device_update_dynamic_ip_setup(NMDevice *self) if (priv->dnsmasq_manager) { /* FIXME: todo */ } - - if (priv->lldp_listener && nm_lldp_listener_is_running(priv->lldp_listener)) { - nm_lldp_listener_stop(priv->lldp_listener); - if (!nm_lldp_listener_start(priv->lldp_listener, nm_device_get_ifindex(self), &error)) { - _LOGD(LOGD_DEVICE, - "LLDP listener %p could not be restarted: %s", - priv->lldp_listener, - error->message); - g_clear_error(&error); - set_interface_flags(self, NM_DEVICE_INTERFACE_FLAG_LLDP_CLIENT_ENABLED, FALSE); - } else - set_interface_flags(self, NM_DEVICE_INTERFACE_FLAG_LLDP_CLIENT_ENABLED, TRUE); - } } /*****************************************************************************/ |