device: Fix dotted vlan interface staying down

Using the config below a dotted vlan interface stays down as get_vlan_device
does not find the device due to the aliased device stacked on top of the base
device.
As all devices; aliased devices being the exception; are in the device list
use device_find to find the device when setting the link state

config interface 'test'
    option proto 'static'
    option ipaddr '192.168.2.1'
    option netmask '255.255.255.0'

config interface 'test2'
    option ifname '@test.1'
    option proto 'dhcp'

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

diff --git a/device.c b/device.c
index a4d804e0934f912f7d51807176c1e378ed93d38e..fa3d00fe8f9273daeae41d37abff2cca9af2c38b 100644 (file)
--- a/device.c
+++ b/device.c
@@ -476,6 +476,14 @@ device_create_default(const char *name, bool external)
        return dev;
 }
 
+struct device *
+device_find(const char *name)
+{
+       struct device *dev;
+
+       return avl_find_element(&devices, name, dev, avl);
+}
+
 struct device *
 device_get(const char *name, int create)
 {

diff --git a/device.h b/device.h
index b069a2b4ddf8b5fef805d65aa807a1613782ba02..e13e43509bee8334330a4a32d2f7f11c6bbc556c 100644 (file)
--- a/device.h
+++ b/device.h
@@ -241,7 +241,8 @@ void device_set_default_ps(bool state);
 
 void device_init_virtual(struct device *dev, const struct device_type *type, const char *name);
 int device_init(struct device *iface, const struct device_type *type, const char *ifname);
-void device_cleanup(struct device *iface);
+void device_cleanup(struct device *dev);
+struct device *device_find(const char *name);
 struct device *device_get(const char *name, int create);
 void device_add_user(struct device_user *dep, struct device *iface);
 void device_remove_user(struct device_user *dep);

diff --git a/system-linux.c b/system-linux.c
index 90b0775d57bd26b6ff29f9040f17bf53031469ad..eb785b56395caa03d102276e3973a974719933ee 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -495,7 +495,7 @@ static int cb_rtnl_event(struct nl_msg *msg, void *arg)
        if (!nla[IFLA_IFNAME])
                goto out;
 
-       struct device *dev = device_get(nla_data(nla[IFLA_IFNAME]), false);
+       struct device *dev = device_find(nla_data(nla[IFLA_IFNAME]));
        if (!dev)
                goto out;