X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=d63ffe3b6ad68da0cca0c4de4947dcdc147d48a9;hp=8cedfbae642827b1ff5f650c34cb4dfddb8e4034;hb=134775b1f41fa19a816768268b9d0f8dad86bd90;hpb=51b3f21fef7f581a7df6d8a73d8b973f9eb355d2

diff --git a/device.h b/device.h
index 8cedfba..d63ffe3 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 *);
@@ -58,7 +59,7 @@ struct device_type {
 enum {
 	DEV_OPT_MTU		= (1 << 0),
 	DEV_OPT_MACADDR		= (1 << 1),
-	DEV_OPT_TXQUEUELEN	= (1 << 2)
+	DEV_OPT_TXQUEUELEN	= (1 << 2),
 };
 
 /* events broadcasted to all users of a device */
@@ -75,18 +76,22 @@ 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);
 };
@@ -98,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
  */
@@ -106,8 +111,8 @@ struct device {
 	const struct device_type *type;
 
 	struct avl_node avl;
-	struct list_head users;
-	struct list_head aliases;
+	struct safe_list users;
+	struct safe_list aliases;
 
 	char ifname[IFNAMSIZ + 1];
 	int ifindex;
@@ -143,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);