X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.h;h=87a7cb3a195b92a45eecbc92b69813a4c3d57931;hp=dd72389a31c1c7ebe36008c41c5d937b4c41644e;hb=d5202486636818e3ff48ede9d3e06c886c659c0a;hpb=f62eea9492a669bcf96464e85f04ae5e80190a76

diff --git a/interface.h b/interface.h
index dd72389..87a7cb3 100644
--- a/interface.h
+++ b/interface.h
@@ -2,31 +2,18 @@
 #define __NETIFD_INTERFACE_H
 
 struct interface;
-struct interface_proto;
 struct interface_proto_state;
 
-extern struct list_head interfaces;
-
 enum interface_event {
 	IFEV_UP,
 	IFEV_DOWN,
 };
 
-enum interface_proto_event {
-	PROTO_UP,
-	PROTO_DOWN,
-};
-
-struct interface_proto_state {
-	struct interface *iface;
-	const struct interface_proto *proto;
-
-	/* filled in by the protocol user */
-	int (*proto_event)(struct interface_proto_state *, enum interface_proto_event ev);
-
-	/* filled in by the protocol handler */
-	int (*event)(struct interface_proto_state *, enum interface_event ev);
-	void (*free)(struct interface_proto_state *);
+enum interface_state {
+	IFS_SETUP,
+	IFS_UP,
+	IFS_TEARDOWN,
+	IFS_DOWN,
 };
 
 struct interface_error {
@@ -45,10 +32,11 @@ struct interface {
 
 	char name[IFNAMSIZ];
 
-	bool up;
 	bool active;
 	bool autostart;
 
+	enum interface_state state;
+
 	/* main interface that the interface is bound to */
 	struct device_user main_dev;
 
@@ -56,7 +44,7 @@ struct interface {
 	struct device_user *l3_iface;
 
 	/* primary protocol state */
-	struct interface_proto_state *state;
+	struct interface_proto_state *proto;
 
 	/* errors/warnings while trying to bring up the interface */
 	struct list_head errors;