X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=750c0f2bb44b880a740b0de9cfdb51b575a8bdb9;hp=91cffcab444522e9dde471147299d4f040451e7b;hb=e472b121daaef2efc3301445207e4c9ad69b06ae;hpb=ccca61c97d460d73f29750abdf38cea20ac440f3

diff --git a/interface.h b/interface.h
index 91cffca..750c0f2 100644
--- a/interface.h
+++ b/interface.h
@@ -39,6 +39,18 @@ struct interface_user {
 	void (*cb)(struct interface_user *dep, enum interface_event ev);
 };
 
+struct interface_ip_settings {
+	struct interface *iface;
+	bool enabled;
+	bool no_defaultroute;
+
+	struct vlist_tree addr;
+	struct vlist_tree route;
+
+	struct vlist_simple_tree dns_servers;
+	struct vlist_simple_tree dns_search;
+};
+
 /*
  * interface configuration
  */
@@ -62,7 +74,6 @@ struct interface {
 
 	/* main interface that the interface is bound to */
 	struct device_user main_dev;
-	bool hotplug_dev;
 
 	/* interface that layer 3 communication will go through */
 	struct device_user *l3_dev;
@@ -73,11 +84,8 @@ struct interface {
 	const struct proto_handler *proto_handler;
 	struct interface_proto_state *proto;
 
-	struct vlist_tree proto_addr;
-	struct vlist_tree proto_route;
-
-	struct list_head proto_dns_servers;
-	struct list_head proto_dns_search;
+	struct interface_ip_settings proto_ip;
+	struct interface_ip_settings config_ip;
 
 	/* errors/warnings while trying to bring up the interface */
 	struct list_head errors;
@@ -105,12 +113,15 @@ void __interface_set_down(struct interface *iface, bool force);
 void interface_add_user(struct interface_user *dep, struct interface *iface);
 void interface_remove_user(struct interface_user *dep);
 
-int interface_add_link(struct interface *iface, struct device *llif);
-void interface_remove_link(struct interface *iface, struct device *llif);
+int interface_add_link(struct interface *iface, struct device *dev);
+int interface_remove_link(struct interface *iface, struct device *dev);
 
 void interface_add_error(struct interface *iface, const char *subsystem,
 			 const char *code, const char **data, int n_data);
 
+void interface_update_start(struct interface *iface);
+void interface_update_complete(struct interface *iface);
+
 void interface_queue_event(struct interface *iface, enum interface_event ev);
 void interface_dequeue_event(struct interface *iface);