diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-24 14:53:07 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-24 14:53:07 -0500 |
| commit | a62a36104338c17e7a957e13703c841a1dd5ceca (patch) | |
| tree | bbebe700ea2b47cf6b6b515ab2ab3cd980b23926 /src/core/nm-l3cfg.c | |
| parent | 4d660d8947426e043acb5ff012b929c9ef538839 (diff) | |
| parent | 1b1ea5e7932eb8b9491beb22f69844697751f1ce (diff) | |
Merge tag 'debian/1.36.0-1' into ubuntu/master
network-manager Debian release 1.36.0-1
Diffstat (limited to 'src/core/nm-l3cfg.c')
| -rw-r--r-- | src/core/nm-l3cfg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c index 7d00264b..eeb041d0 100644 --- a/src/core/nm-l3cfg.c +++ b/src/core/nm-l3cfg.c @@ -917,7 +917,9 @@ _obj_states_externally_removed_track(NML3Cfg *self, const NMPObject *obj, gboole return; } - nm_assert(c_list_is_empty(&obj_state->os_zombie_lst)); + /* Even if this is a zombie (os_zombie_lst), it is still in platform. We continue + * tracking it, until it gets deleted from platform or until the os_zombie_count + * drops to zero. We don't need to handle this specially here. */ if (in_platform) { nmp_object_ref_set(&obj_state->os_plobj, obj); |