projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add support for calls to a hotplug script on interface state changes
[project/netifd.git]
/
utils.c
diff --git
a/utils.c
b/utils.c
index
a67a8c9
..
5219546
100644
(file)
--- 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)
{
__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;
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)
{
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);
}
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;
{
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) {
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;
goto update_only;
- old_node = container_of(anode, struct vlist_node, avl);
avl_delete(&tree->avl, anode);
}
avl_delete(&tree->avl, anode);
}