diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2021-01-11 16:40:21 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2021-01-14 09:06:17 +0100 |
| commit | 8180b0180beba0c492bf172a32069c77e501f884 (patch) | |
| tree | 57a2a1f015ec395d9239d589d245ec09b9b347e5 | |
| parent | 8e735a51b886b2e9942f6e33cdbf4155d054543c (diff) | |
| download | NetworkManager-bg/rh1888348.tar.gz | |
device: clean up dispatcher calls when canceling an activationbg/rh1888348
Ensure the callback for dispatcher calls is not executed, or it will
resume the activation chain we want to interrupt.
https://bugzilla.redhat.com/show_bug.cgi?id=1888348
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/723
| -rw-r--r-- | src/devices/nm-device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 3ab81df0fa..355f1047a2 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -15686,6 +15686,7 @@ _cancel_activation(NMDevice *self) priv->fw_state = FIREWALL_STATE_INITIALIZED; } + dispatcher_cleanup(self); ip_check_gw_ping_cleanup(self); /* Break the activation chain */ |