extend vlist code to allow keeping the old data structure instead of the new one...

[project/netifd.git] / device.h

diff --git a/device.h b/device.h
index e11df1f..cb7146a 100644 (file)
--- a/device.h
+++ b/device.h
@@ -37,42 +37,6 @@ enum {
        DEV_OPT_TXQUEUELEN      = (1 << 2)
 };
 
-enum device_addr_flags {
-       /* address family for routes and addresses */
-       DEVADDR_INET4   = (0 << 0),
-       DEVADDR_INET6   = (1 << 0),
-       DEVADDR_FAMILY  = DEVADDR_INET4 | DEVADDR_INET6,
-
-       /* device route (no gateway) */
-       DEVADDR_DEVICE  = (1 << 1),
-};
-
-union if_addr {
-       struct in_addr in;
-       struct in6_addr in6;
-};
-
-struct device_addr {
-       struct list_head list;
-       void *ctx;
-
-       enum device_addr_flags flags;
-
-       unsigned int mask;
-       union if_addr addr;
-};
-
-struct device_route {
-       struct list_head list;
-       void *ctx;
-
-       enum device_addr_flags flags;
-
-       unsigned int mask;
-       union if_addr addr;
-       union if_addr nexthop;
-};
-
 /* 
  * link layer device. typically represents a linux network device.
  * can be used to support VLANs as well
@@ -124,6 +88,7 @@ enum device_event {
 struct device_user {
        struct list_head list;
 
+       bool claimed;
        struct device *dev;
        void (*cb)(struct device_user *, enum device_event);
 };
@@ -147,8 +112,8 @@ 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);
-int device_claim(struct device *dev);
-void device_release(struct device *dev);
+int device_claim(struct device_user *dep);
+void device_release(struct device_user *dep);
 int check_device_state(struct device *dev);
 
 static inline void
@@ -157,7 +122,7 @@ device_free(struct device *dev)
        dev->type->free(dev);
 }
 
-void device_free_all(void);
+void device_free_unused(struct device *dev);
 
 struct device *get_vlan_device_chain(const char *ifname, bool create);