X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=dbcaf771e73ac2e04a8bb591f219a381f435b78d;hp=88a421f45df4373c243112bbe9fc5aedc75b961c;hb=ddbd2cc51b3db14f6a8bd46ceebaee9097a50b78;hpb=4bf10a76e01d2f2971a86765722a4c4a65b584a7

diff --git a/device.h b/device.h
index 88a421f..dbcaf77 100644
--- a/device.h
+++ b/device.h
@@ -15,6 +15,7 @@
 #define __LL_H
 
 #include <libubox/avl.h>
+#include <libubox/safe_list.h>
 #include <netinet/in.h>
 
 struct device;
@@ -44,7 +45,7 @@ struct device_type {
 	struct list_head list;
 	const char *name;
 
-	const struct config_param_list *config_params;
+	const struct uci_blob_param_list *config_params;
 
 	struct device *(*create)(const char *name, struct blob_attr *attr);
 	void (*config_init)(struct device *);
@@ -75,16 +76,21 @@ enum device_event {
 
 	DEV_EVENT_LINK_UP,
 	DEV_EVENT_LINK_DOWN,
+
+	__DEV_EVENT_MAX
 };
 
 /*
  * device dependency with callbacks
  */
 struct device_user {
-	struct list_head list;
+	struct safe_list list;
 
 	bool claimed;
 	bool hotplug;
+	bool alias;
+
+	uint8_t ev_idx[__DEV_EVENT_MAX];
 
 	struct device *dev;
 	void (*cb)(struct device_user *, enum device_event);
@@ -97,7 +103,7 @@ struct device_settings {
 	uint8_t macaddr[6];
 };
 
-/* 
+/*
  * link layer device. typically represents a linux network device.
  * can be used to support VLANs as well
  */
@@ -105,7 +111,8 @@ struct device {
 	const struct device_type *type;
 
 	struct avl_node avl;
-	struct list_head users;
+	struct safe_list users;
+	struct safe_list aliases;
 
 	char ifname[IFNAMSIZ + 1];
 	int ifindex;
@@ -141,10 +148,11 @@ struct device_hotplug_ops {
 	int (*del)(struct device *main, struct device *member);
 };
 
-extern const struct config_param_list device_attr_list;
+extern const struct uci_blob_param_list device_attr_list;
 extern const struct device_type simple_device_type;
 extern const struct device_type bridge_device_type;
 extern const struct device_type tunnel_device_type;
+extern const struct device_type macvlan_device_type;
 
 void device_lock(void);
 void device_unlock(void);