clean up variable names (llif -> dev)

[project/netifd.git] / interface.h

diff --git a/interface.h b/interface.h
index 3a0b96f..6bd8761 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -1,22 +1,21 @@
 #ifndef __NETIFD_INTERFACE_H
 #define __NETIFD_INTERFACE_H
 
+#include "device.h"
+
 struct interface;
-struct interface_proto;
 struct interface_proto_state;
 
-extern struct list_head interfaces;
-
 enum interface_event {
        IFEV_UP,
        IFEV_DOWN,
 };
 
-struct interface_proto_state {
-       const struct interface_proto *proto;
-
-       int (*event)(struct interface *, struct interface_proto_state *, enum interface_event ev);
-       void (*free)(struct interface *, struct interface_proto_state *);
+enum interface_state {
+       IFS_SETUP,
+       IFS_UP,
+       IFS_TEARDOWN,
+       IFS_DOWN,
 };
 
 struct interface_error {
@@ -35,10 +34,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;
 
@@ -46,7 +46,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;