X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.h;h=c76c472312432d7f756f3d523168d8a4df5e2f88;hp=c0b112dddebfd53190766a06d60d7d45b488165e;hb=fa31a460d8cb59288c4324eb684bd3ce21e837c3;hpb=a6baf95e700f1abe8dafe71f5f8722baea6b6ac2

diff --git a/device.h b/device.h
index c0b112d..c76c472 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
 
@@ -16,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,
 };
 
@@ -73,6 +88,13 @@ struct device_user {
 	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
@@ -88,9 +110,12 @@ struct device {
 
 	struct blob_attr *config;
 	bool config_pending;
+	bool sys_present;
 	bool present;
 	int active;
 	bool external;
+	bool disabled;
+	bool deferred;
 
 	bool current_config;
 	bool default_config;
@@ -102,12 +127,8 @@ struct device {
 
 	struct device_user parent;
 
-	/* settings */
-	unsigned int flags;
-
-	unsigned int mtu;
-	unsigned int txqueuelen;
-	uint8_t macaddr[6];
+	struct device_settings orig_settings;
+	struct device_settings settings;
 };
 
 struct device_hotplug_ops {
@@ -119,6 +140,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);
@@ -143,6 +165,7 @@ 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_refresh_present(struct device *dev);
 int device_claim(struct device_user *dep);
 void device_release(struct device_user *dep);
 int device_check_state(struct device *dev);
@@ -154,4 +177,18 @@ void device_free_unused(struct device *dev);
 struct device *get_vlan_device_chain(const char *ifname, bool create);
 void alias_notify_device(const char *name, struct device *dev);
 
+static inline void
+device_set_deferred(struct device *dev, bool value)
+{
+	dev->deferred = value;
+	device_refresh_present(dev);
+}
+
+static inline void
+device_set_disabled(struct device *dev, bool value)
+{
+	dev->disabled = value;
+	device_refresh_present(dev);
+}
+
 #endif