projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move system_flush_routes() call to mark_interface_down()
[project/netifd.git]
/
utils.c
diff --git
a/utils.c
b/utils.c
index
0b80064
..
e5f3d89
100644
(file)
--- a/
utils.c
+++ b/
utils.c
@@
-9,10
+9,8
@@
avl_strcmp(const void *k1, const void *k2, void *ptr)
}
void
}
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)
{
{
- tree->key_offset = offset;
tree->update = update;
tree->version = 1;
tree->update = update;
tree->version = 1;
@@
-28,11
+26,10
@@
vlist_delete(struct vlist_tree *tree, struct vlist_node *node)
}
void
}
void
-vlist_add(struct vlist_tree *tree, struct vlist_node *node)
+vlist_add(struct vlist_tree *tree, struct vlist_node *node
, void *key
)
{
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->key_offset;
node->avl.key = key;
node->version = tree->version;
node->avl.key = key;
node->version = tree->version;
@@
-40,8
+37,10
@@
vlist_add(struct vlist_tree *tree, struct vlist_node *node)
anode = avl_find(&tree->avl, key);
if (anode) {
old_node = container_of(anode, struct vlist_node, avl);
anode = avl_find(&tree->avl, key);
if (anode) {
old_node = container_of(anode, struct vlist_node, avl);
- if (tree->keep_old || tree->no_delete)
+ if (tree->keep_old || tree->no_delete) {
+ old_node->version = tree->version;
goto update_only;
goto update_only;
+ }
avl_delete(&tree->avl, anode);
}
avl_delete(&tree->avl, anode);
}
@@
-58,7
+57,8
@@
vlist_flush(struct vlist_tree *tree)
struct vlist_node *node, *tmp;
avl_for_each_element_safe(&tree->avl, node, avl, tmp) {
struct vlist_node *node, *tmp;
avl_for_each_element_safe(&tree->avl, node, avl, tmp) {
- if (node->version == tree->version)
+ if ((node->version == tree->version || node->version == -1) &&
+ tree->version != -1)
continue;
vlist_delete(tree, node);
continue;
vlist_delete(tree, node);
@@
-68,7
+68,7
@@
vlist_flush(struct vlist_tree *tree)
void
vlist_flush_all(struct vlist_tree *tree)
{
void
vlist_flush_all(struct vlist_tree *tree)
{
- tree->version
++
;
+ tree->version
= -1
;
vlist_flush(tree);
}
vlist_flush(tree);
}
@@
-97,7
+97,8
@@
vlist_simple_flush(struct vlist_simple_tree *tree)
struct vlist_simple_node *n, *tmp;
list_for_each_entry_safe(n, tmp, &tree->list, list) {
struct vlist_simple_node *n, *tmp;
list_for_each_entry_safe(n, tmp, &tree->list, list) {
- if (n->version == tree->version)
+ if ((n->version == tree->version || n->version == -1) &&
+ tree->version != -1)
continue;
vlist_simple_delete(tree, n);
continue;
vlist_simple_delete(tree, n);
@@
-107,6
+108,6
@@
vlist_simple_flush(struct vlist_simple_tree *tree)
void
vlist_simple_flush_all(struct vlist_simple_tree *tree)
{
void
vlist_simple_flush_all(struct vlist_simple_tree *tree)
{
- tree->version
++
;
+ tree->version
= -1
;
vlist_simple_flush(tree);
}
vlist_simple_flush(tree);
}