do not replace proto_ip dns servers on config reload

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 489c660..b6f4725 100644 (file)
--- a/device.c
+++ b/device.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -112,7 +125,6 @@ static void simple_device_free(struct device *dev)
 {
        if (dev->parent.dev)
                device_remove_user(&dev->parent);
-       device_cleanup(dev);
        free(dev);
 }
 
@@ -162,8 +174,6 @@ static void alias_device_free(struct device *dev)
 {
        struct alias_device *alias;
 
-       device_cleanup(dev);
-
        alias = container_of(dev, struct alias_device, dev);
        avl_delete(&aliases, &alias->avl);
        free(alias);
@@ -312,7 +322,8 @@ void device_release(struct device_user *dep)
                return;
 
        device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
-       dev->set_state(dev, false);
+       if (!dep->hotplug)
+               dev->set_state(dev, false);
        device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
 
@@ -465,6 +476,12 @@ device_set_disabled(struct device *dev, bool value)
 
 void device_add_user(struct device_user *dep, struct device *dev)
 {
+       if (dep->dev)
+               device_remove_user(dep);
+
+       if (!dev)
+               return;
+
        dep->dev = dev;
        list_add_tail(&dep->list, &dev->users);
        if (dep->cb && dev->present) {
@@ -478,6 +495,8 @@ void
 device_free(struct device *dev)
 {
        __devlock++;
+       free(dev->config);
+       device_cleanup(dev);
        dev->type->free(dev);
        __devlock--;
 }
@@ -550,7 +569,7 @@ device_reload_config(struct device *dev, struct blob_attr *attr)
                                blob_data(attr), blob_len(attr));
 
                device_init_settings(dev, tb);
-               return DEV_CONFIG_APPLIED;
+               return DEV_CONFIG_RESTART;
        } else
                return DEV_CONFIG_RECREATE;
 }
@@ -630,11 +649,12 @@ device_create(const char *name, const struct device_type *type,
                odev->current_config = true;
                change = device_set_config(odev, type, config);
                switch (change) {
+               case DEV_CONFIG_RESTART:
                case DEV_CONFIG_APPLIED:
                        D(DEVICE, "Device '%s': config applied\n", odev->ifname);
                        free(odev->config);
                        odev->config = config;
-                       if (odev->present) {
+                       if (change == DEV_CONFIG_RESTART && odev->present) {
                                device_set_present(odev, false);
                                device_set_present(odev, true);
                        }