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:19:45 +0100 |
| commit | 26ba5e9d9e335ecd4a36e4960d0c1d1deb76aaef (patch) | |
| tree | 6c384a796581b53c90953151af45194cca51b8b6 | |
| parent | ffd87f771857c9470bea639903f6c937c401c6b1 (diff) | |
| download | NetworkManager-26ba5e9d9e335ecd4a36e4960d0c1d1deb76aaef.tar.gz | |
device: clean up dispatcher calls when canceling an activation
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
(cherry picked from commit 8180b0180beba0c492bf172a32069c77e501f884)
(cherry picked from commit 88eb0beb5277da7973bf0f22bfd547abb4396988)
(cherry picked from commit cdbd6bd9e139d11aacd2447994599763ab3624cd)
| -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 4151644619..63730a1087 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -15205,6 +15205,7 @@ _cancel_activation (NMDevice *self) priv->fw_state = FIREWALL_STATE_INITIALIZED; } + dispatcher_cleanup (self); ip_check_gw_ping_cleanup (self); /* Break the activation chain */ |