X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.c;h=ba31b642947ea577ddcb9a98d2986f3e1a725d8e;hp=a67a8c9d5d8dbec47e718260baba07d2008c63ad;hb=6803aef644a5112f331e6de4d37d78718b76a9bf;hpb=98565127c60cba3d5b747bb9eb698e06d187f45b

diff --git a/utils.c b/utils.c
index a67a8c9..ba31b64 100644
--- a/utils.c
+++ b/utils.c
@@ -11,7 +11,7 @@ void
 __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp,
 	     vlist_update_cb update, int offset)
 {
-	tree->node_offset = offset;
+	tree->key_offset = offset;
 	tree->update = update;
 	tree->version = 1;
 
@@ -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);
 }
 
@@ -30,17 +31,17 @@ vlist_add(struct vlist_tree *tree, struct vlist_node *node)
 {
 	struct vlist_node *old_node = NULL;
 	struct avl_node *anode;
-	void *key = (char *) node - tree->node_offset;
+	void *key = (char *) node + tree->key_offset;
 
 	node->avl.key = key;
 	node->version = tree->version;
 
 	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);
 	}