diff options
-rw-r--r-- | config.c | 2 | ||||
-rw-r--r-- | device.c | 22 | ||||
-rw-r--r-- | device.h | 2 |
3 files changed, 17 insertions, 9 deletions
@@ -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(); @@ -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); } @@ -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); |