wireless: fix premature removal of hotplug devices due to down state

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 151dc9ddc3f7f401942f55b5765408bf7e1a3f1f..03c781b516776cd35a2c3408c766513e0e57a4c3 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -437,7 +437,7 @@ interface_main_dev_cb(struct device_user *dep, enum device_event ev)
                break;
        case DEV_EVENT_REMOVE:
                interface_set_available(iface, false);
-               if (dep->dev && dep->dev->external)
+               if (dep->dev && dep->dev->external && !dep->dev->sys_present)
                        interface_set_main_dev(iface, NULL);
                break;
        case DEV_EVENT_UP:
@@ -1248,7 +1248,7 @@ interface_device_config_changed(struct interface *if_old, struct interface *if_n
        struct blob_attr *ntb[__DEV_ATTR_MAX];
        struct blob_attr *otb[__DEV_ATTR_MAX];
        struct device *dev = if_old->main_dev.dev;
-       unsigned long diff = 0;
+       unsigned long diff[2] = {};
 
        BUILD_BUG_ON(sizeof(diff) < __DEV_ATTR_MAX / 8);
 
@@ -1267,8 +1267,9 @@ interface_device_config_changed(struct interface *if_old, struct interface *if_n
        blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, ntb,
                blob_data(if_new->config), blob_len(if_new->config));
 
-       uci_blob_diff(ntb, otb, &device_attr_list, &diff);
-       return diff;
+       uci_blob_diff(ntb, otb, &device_attr_list, diff);
+
+       return diff[0] | diff[1];
 }
 
 static void