X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=utils.c;h=156b02549b72249d441f7f1e552378149789bde7;hb=f7ac9bf93cc07755d15a7ab65d17dc66b8fcea80;hp=629cdb2bf228fdc4cf66b38e58d81d0c05b775aa;hpb=c6e1778d4429032087b36fb0dde2ae2fecf53b4a;p=project%2Fnetifd.git diff --git a/utils.c b/utils.c index 629cdb2..156b025 100644 --- a/utils.c +++ b/utils.c @@ -1,3 +1,16 @@ +/* + * netifd - network interface daemon + * Copyright (C) 2012 Felix Fietkau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ #include #include #include "utils.h" @@ -57,7 +70,8 @@ vlist_flush(struct vlist_tree *tree) 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); @@ -67,7 +81,7 @@ vlist_flush(struct vlist_tree *tree) void vlist_flush_all(struct vlist_tree *tree) { - tree->version++; + tree->version = -1; vlist_flush(tree); } @@ -96,7 +110,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) { - if (n->version == tree->version) + if ((n->version == tree->version || n->version == -1) && + tree->version != -1) continue; vlist_simple_delete(tree, n); @@ -106,6 +121,6 @@ vlist_simple_flush(struct vlist_simple_tree *tree) void vlist_simple_flush_all(struct vlist_simple_tree *tree) { - tree->version++; + tree->version = -1; vlist_simple_flush(tree); }