fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 08:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: clean up dispatcher calls when canceling an activation

Browse source 
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
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/devices/nm-device.c
View file

@ -15205,6 +15205,7 @@ _cancel_activation (NMDevice *self)
priv->fw_state = FIREWALL_STATE_INITIALIZED; priv->fw_state = FIREWALL_STATE_INITIALIZED;
} }
dispatcher_cleanup (self);
ip_check_gw_ping_cleanup (self); ip_check_gw_ping_cleanup (self);
/* Break the activation chain */ /* Break the activation chain */