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 8180b0180b)
(cherry picked from commit 88eb0beb52)
(cherry picked from commit cdbd6bd9e1)
This commit is contained in:
Beniamino Galvani 2021-01-11 16:40:21 +01:00
parent ffd87f7718
commit 26ba5e9d9e

View file

@ -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 */