X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=7307414d737b4b9a2467d9dc966657847b60cfba;hp=0019b6c2481185b5b34c5bc02d90410204565f55;hb=82d2762a5ffaf67307bab6f0753dc31311e16f21;hpb=07a47add60b567f65dd2051fe45ac49e1ae97524

diff --git a/device.c b/device.c
index 0019b6c..7307414 100644
--- a/device.c
+++ b/device.c
@@ -120,10 +120,15 @@ static int set_device_state(struct device *dev, bool state)
 	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;
@@ -138,8 +143,14 @@ int device_claim(struct device *dev)
 	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);
@@ -168,7 +179,7 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con
 	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;
 }
@@ -217,7 +228,7 @@ void device_cleanup(struct device *dev)
 {
 	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;
@@ -250,29 +261,35 @@ void device_add_user(struct device_user *dep, struct device *dev)
 	}
 }
 
+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);
 }