X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=d41042b1828a32ce9b7814fec984fbe304421382;hp=057506b63bb0a71d429d9d88cf5ee5a1eb694e96;hb=69c5043fdcea724f59055630eb0cf593c41732cb;hpb=fb0e4138070d7c2ce723af5780e763af3a1353d8

diff --git a/device.h b/device.h
index 057506b..d41042b 100644
--- a/device.h
+++ b/device.h
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * 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.
+ */
 #ifndef __LL_H
 #define __LL_H
 
@@ -5,6 +18,7 @@
 #include <netinet/in.h>
 
 struct device;
+struct device_user;
 struct device_hotplug_ops;
 
 typedef int (*device_state_cb)(struct device *, bool up);
@@ -15,12 +29,14 @@ enum {
 	DEV_ATTR_MTU,
 	DEV_ATTR_MACADDR,
 	DEV_ATTR_TXQUEUELEN,
+	DEV_ATTR_ENABLED,
 	__DEV_ATTR_MAX,
 };
 
 enum dev_change_type {
 	DEV_CONFIG_NO_CHANGE,
 	DEV_CONFIG_APPLIED,
+	DEV_CONFIG_RESTART,
 	DEV_CONFIG_RECREATE,
 };
 
@@ -45,6 +61,40 @@ enum {
 	DEV_OPT_TXQUEUELEN	= (1 << 2)
 };
 
+/* events broadcasted to all users of a device */
+enum device_event {
+	DEV_EVENT_ADD,
+	DEV_EVENT_REMOVE,
+
+	DEV_EVENT_SETUP,
+	DEV_EVENT_TEARDOWN,
+	DEV_EVENT_UP,
+	DEV_EVENT_DOWN,
+
+	DEV_EVENT_LINK_UP,
+	DEV_EVENT_LINK_DOWN,
+};
+
+/*
+ * device dependency with callbacks
+ */
+struct device_user {
+	struct list_head list;
+
+	bool claimed;
+	bool hotplug;
+
+	struct device *dev;
+	void (*cb)(struct device_user *, enum device_event);
+};
+
+struct device_settings {
+	unsigned int flags;
+	unsigned int mtu;
+	unsigned int txqueuelen;
+	uint8_t macaddr[6];
+};
+
 /* 
  * link layer device. typically represents a linux network device.
  * can be used to support VLANs as well
@@ -60,9 +110,11 @@ struct device {
 
 	struct blob_attr *config;
 	bool config_pending;
+	bool sys_present;
 	bool present;
 	int active;
 	bool external;
+	bool disabled;
 
 	bool current_config;
 	bool default_config;
@@ -72,42 +124,14 @@ struct device {
 
 	const struct device_hotplug_ops *hotplug_ops;
 
-	/* settings */
-	unsigned int flags;
+	struct device_user parent;
 
-	unsigned int mtu;
-	unsigned int txqueuelen;
-	uint8_t macaddr[6];
-};
-
-/* events broadcasted to all users of a device */
-enum device_event {
-	DEV_EVENT_ADD,
-	DEV_EVENT_REMOVE,
-
-	DEV_EVENT_SETUP,
-	DEV_EVENT_TEARDOWN,
-	DEV_EVENT_UP,
-	DEV_EVENT_DOWN,
-
-	DEV_EVENT_LINK_UP,
-	DEV_EVENT_LINK_DOWN,
-};
-
-/*
- * device dependency with callbacks
- */
-struct device_user {
-	struct list_head list;
-
-	bool claimed;
-	bool hotplug;
-
-	struct device *dev;
-	void (*cb)(struct device_user *, enum device_event);
+	struct device_settings orig_settings;
+	struct device_settings settings;
 };
 
 struct device_hotplug_ops {
+	int (*prepare)(struct device *dev);
 	int (*add)(struct device *main, struct device *member);
 	int (*del)(struct device *main, struct device *member);
 };
@@ -115,6 +139,7 @@ struct device_hotplug_ops {
 extern const struct config_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;
 
 void device_lock(void);
 void device_unlock(void);
@@ -139,17 +164,13 @@ void device_add_user(struct device_user *dep, struct device *iface);
 void device_remove_user(struct device_user *dep);
 
 void device_set_present(struct device *dev, bool state);
+void device_set_disabled(struct device *dev, bool value);
 int device_claim(struct device_user *dep);
 void device_release(struct device_user *dep);
 int device_check_state(struct device *dev);
 void device_dump_status(struct blob_buf *b, struct device *dev);
 
-static inline void
-device_free(struct device *dev)
-{
-	dev->type->free(dev);
-}
-
+void device_free(struct device *dev);
 void device_free_unused(struct device *dev);
 
 struct device *get_vlan_device_chain(const char *ifname, bool create);