X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.h;h=319e53058329af59c84d0fab992cfc016dd87336;hp=f5ccfaaf3e8414af0c5084d72d21218f7f78f6b7;hb=478d49f227dfed9c1b2178107bcb06221956e8f8;hpb=1c326d5a6cbef455e9ae148072161f620540ba54

diff --git a/utils.h b/utils.h
index f5ccfaa..319e530 100644
--- a/utils.h
+++ b/utils.h
@@ -18,6 +18,7 @@
 #include <libubox/avl.h>
 #include <libubox/avl-cmp.h>
 #include <libubox/blobmsg.h>
+#include <libubox/vlist.h>
 
 #ifndef __OPTIMIZE__
 #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
@@ -40,47 +41,6 @@ static inline bool blobmsg_get_bool_default(struct blob_attr *attr, bool val)
 
 #define __init __attribute__((constructor))
 
-struct vlist_tree;
-struct vlist_node;
-
-typedef void (*vlist_update_cb)(struct vlist_tree *tree,
-				struct vlist_node *node_new,
-				struct vlist_node *node_old);
-
-struct vlist_tree {
-	struct avl_tree avl;
-
-	vlist_update_cb update;
-	bool keep_old;
-	bool no_delete;
-
-	int version;
-};
-
-struct vlist_node {
-	struct avl_node avl;
-	int version;
-};
-
-void vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update);
-
-#define vlist_find(tree, name, element, node_member) \
-	avl_find_element(&(tree)->avl, name, element, node_member.avl)
-
-static inline void vlist_update(struct vlist_tree *tree)
-{
-	tree->version++;
-}
-
-void vlist_add(struct vlist_tree *tree, struct vlist_node *node, void *key);
-void vlist_delete(struct vlist_tree *tree, struct vlist_node *node);
-void vlist_flush(struct vlist_tree *tree);
-void vlist_flush_all(struct vlist_tree *tree);
-
-#define vlist_for_each_element(tree, element, node_member) \
-	avl_for_each_element(&(tree)->avl, element, node_member.avl)
-
-
 struct vlist_simple_tree {
 	struct list_head list;
 	int head_offset;