From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 5 Sep 2011 01:55:54 +0000 (+0200)
Subject: improve interface for cleaning up unused devices
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=5f739f10e9d7af0eb412102356434f905ed8f467;ds=sidebyside

improve interface for cleaning up unused devices
---

diff --git a/config.c b/config.c
index 1649cee..2fba534 100644
--- a/config.c
+++ b/config.c
@@ -221,7 +221,7 @@ config_init_interfaces(const char *name)
 		if (!strcmp(s->type, "interface"))
 			config_parse_interface(s);
 	}
-	device_free_all();
+	device_free_unused(NULL);
 	config_init = false;
 
 	interface_start_pending();
diff --git a/device.c b/device.c
index c02335c..e206a76 100644
--- a/device.c
+++ b/device.c
@@ -278,15 +278,23 @@ void device_remove_user(struct device_user *dep)
 	dep->dev = NULL;
 }
 
+static void
+__device_free_unused(struct device *dev)
+{
+	if (!list_empty(&dev->users))
+		return;
+
+	device_free(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);
 }
diff --git a/device.h b/device.h
index 63ffb21..1abd567 100644
--- a/device.h
+++ b/device.h
@@ -158,7 +158,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);