X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.c;h=521954639ee7b87b8a32ad6e95892c39401923d1;hp=cc222908efa94a414dc650ec92680f0b9d38bafe;hb=210b973708d62137b8283d43908292039056f415;hpb=13ec81ce3e2f77504818de0bf89a2a1edd7e0ba2 diff --git a/utils.c b/utils.c index cc22290..5219546 100644 --- a/utils.c +++ b/utils.c @@ -21,7 +21,8 @@ __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, void vlist_delete(struct vlist_tree *tree, struct vlist_node *node) { - avl_delete(&tree->avl, &node->avl); + if (!tree->no_delete) + avl_delete(&tree->avl, &node->avl); tree->update(tree, NULL, node); } @@ -37,10 +38,10 @@ vlist_add(struct vlist_tree *tree, struct vlist_node *node) anode = avl_find(&tree->avl, key); if (anode) { - if (tree->keep_old) + old_node = container_of(anode, struct vlist_node, avl); + if (tree->keep_old || !tree->no_delete) goto update_only; - old_node = container_of(anode, struct vlist_node, avl); avl_delete(&tree->avl, anode); }