diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c index 5307002b41..ca82cd1e31 100644 --- a/src/core/nm-l3-config-data.c +++ b/src/core/nm-l3-config-data.c @@ -1963,6 +1963,7 @@ _dedup_multi_index_cmp(const NML3ConfigData *a, const NML3ConfigData *b, NMPObje NMDedupMultiIter iter_b; NM_CMP_SELF(h_a, h_b); + NM_CMP_DIRECT(h_a->len, h_b->len); nm_assert(h_a->len > 0); diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c index 45646e98fa..e63742a8a2 100644 --- a/src/core/nm-l3cfg.c +++ b/src/core/nm-l3cfg.c @@ -3235,11 +3235,11 @@ _l3cfg_remove_config(NML3Cfg * self, } gboolean -nm_l3cfg_remove_config(NML3Cfg *self, gconstpointer tag, const NML3ConfigData *ifcfg) +nm_l3cfg_remove_config(NML3Cfg *self, gconstpointer tag, const NML3ConfigData *l3cd) { - nm_assert(ifcfg); + nm_assert(l3cd); - return _l3cfg_remove_config(self, tag, FALSE, ifcfg); + return _l3cfg_remove_config(self, tag, FALSE, l3cd); } gboolean diff --git a/src/core/nm-l3cfg.h b/src/core/nm-l3cfg.h index 89fe4cae12..764d7502e1 100644 --- a/src/core/nm-l3cfg.h +++ b/src/core/nm-l3cfg.h @@ -328,7 +328,7 @@ gboolean nm_l3cfg_add_config(NML3Cfg * self, NML3CfgConfigFlags config_flags, NML3ConfigMergeFlags merge_flags); -gboolean nm_l3cfg_remove_config(NML3Cfg *self, gconstpointer tag, const NML3ConfigData *ifcfg); +gboolean nm_l3cfg_remove_config(NML3Cfg *self, gconstpointer tag, const NML3ConfigData *l3cd); gboolean nm_l3cfg_remove_config_all(NML3Cfg *self, gconstpointer tag); gboolean nm_l3cfg_remove_config_all_dirty(NML3Cfg *self, gconstpointer tag);