#include <sys/socket.h>
#include <net/ethernet.h>
+#ifdef linux
+#include <netinet/ether.h>
+#endif
+
#include "netifd.h"
#include "system.h"
#include "config.h"
return 0;
}
-int device_claim(struct device *dev)
+int device_claim(struct device_user *dep)
{
+ struct device *dev = dep->dev;
int ret;
+ if (dep->claimed)
+ return 0;
+
+ dep->claimed = true;
DPRINTF("claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
if (++dev->active != 1)
return 0;
return ret;
}
-void device_release(struct device *dev)
+void device_release(struct device_user *dep)
{
+ struct device *dev = dep->dev;
+
+ if (!dep->claimed)
+ return;
+
+ dep->claimed = false;
dev->active--;
DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active);
assert(dev->active >= 0);
if (name)
strncpy(dev->ifname, name, IFNAMSIZ);
- fprintf(stderr, "Initialize device '%s'\n", dev->ifname);
+ DPRINTF("Initialize device '%s'\n", dev->ifname);
INIT_LIST_HEAD(&dev->users);
dev->type = type;
}
{
struct device_user *dep, *tmp;
- fprintf(stderr, "Clean up device '%s'\n", dev->ifname);
+ DPRINTF("Clean up device '%s'\n", dev->ifname);
list_for_each_entry_safe(dep, tmp, &dev->users, list) {
if (!dep->cb)
continue;
}
}
+static void
+__device_free_unused(struct device *dev)
+{
+ if (!list_empty(&dev->users))
+ return;
+
+ device_free(dev);
+}
+
void device_remove_user(struct device_user *dep)
{
struct device *dev = dep->dev;
- list_del(&dep->list);
-
- if (list_empty(&dev->users)) {
- /* all references have gone away, remove this device */
- device_free(dev);
- }
+ if (dep->claimed)
+ device_release(dep);
+ list_del(&dep->list);
dep->dev = NULL;
+ __device_free_unused(dev);
}
void
-device_free_all(void)
+device_free_unused(struct device *dev)
{
- struct device *dev, *tmp;
+ struct device *tmp;
- avl_for_each_element_safe(&devices, dev, avl, tmp) {
- if (!list_empty(&dev->users))
- continue;
+ if (dev)
+ return __device_free_unused(dev);
- device_free(dev);
- }
+ avl_for_each_element_safe(&devices, dev, avl, tmp)
+ __device_free_unused(dev);
}