rework and fix hotplug interface handling

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 6eb730e0861356b8baa3dc14a27cb17044654e26..11363807b834b69985204e02e7b52266affad082 100644 (file)
--- a/device.c
+++ b/device.c
@@ -179,8 +179,7 @@ alias_notify_device(const char *name, struct device *dev)
        alias->cleanup = !dev;
        if (dev) {
                if (dev != alias->dep.dev) {
-                       if (alias->dep.dev)
-                               device_remove_user(&alias->dep);
+                       device_remove_user(&alias->dep);
                        strcpy(alias->dev.ifname, dev->ifname);
                        device_add_user(&alias->dep, dev);
                }
@@ -396,6 +395,9 @@ void device_remove_user(struct device_user *dep)
 {
        struct device *dev = dep->dev;
 
+       if (!dep->dev)
+               return;
+
        if (dep->claimed)
                device_release(dep);