fix clearing device state, trigger it on device_init()

diff --git a/device.c b/device.c
index 5b27ce0f5c3693616b7bf23c4123c01f427cec40..6929177cd59caee5c4feb233aaf9370c773e64e2 100644 (file)
--- a/device.c
+++ b/device.c
@@ -206,6 +206,7 @@ int device_init(struct device *dev, const struct device_type *type, const char *
        if (ret < 0)
                return ret;
 
+       system_if_clear_state(dev);
        device_check_state(dev);
 
        return 0;

diff --git a/system-dummy.c b/system-dummy.c
index 9a646dcdb5fb85e5a6aea7ff651d2d20c5855577..00a9b2ae51d330aab76bb19a361c59889f6bea15 100644 (file)
--- a/system-dummy.c
+++ b/system-dummy.c
@@ -64,6 +64,11 @@ int system_if_down(struct device *dev)
        return 0;
 }
 
+void system_if_clear_state(struct device *dev)
+{
+       return 0;
+}
+
 int system_if_check(struct device *dev)
 {
        dev->ifindex = 0;

diff --git a/system-linux.c b/system-linux.c
index b823099fc5da6fff6e215e6bcd8c016dd38cf6b3..9f1aa9efb70e4903d3d1a85a3a8c8596f7c2860c 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -202,7 +202,7 @@ static int system_if_flags(const char *ifname, unsigned add, unsigned rem)
 /*
  * Clear bridge (membership) state and bring down device
  */
-static void system_if_clear_state(struct device *dev)
+void system_if_clear_state(struct device *dev)
 {
        char buf[256];
        char *bridge;
@@ -236,7 +236,6 @@ int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg)
 {
        unsigned long args[4] = {};
 
-       system_if_clear_state(bridge);
        if (ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname) < 0)
                return -1;
 
@@ -291,7 +290,6 @@ static int system_vlan(struct device *dev, int id)
 
 int system_vlan_add(struct device *dev, int id)
 {
-       system_if_clear_state(dev);
        return system_vlan(dev, id);
 }
 
@@ -313,7 +311,6 @@ int system_if_down(struct device *dev)
 
 int system_if_check(struct device *dev)
 {
-       system_if_clear_state(dev);
        device_set_present(dev, (system_if_resolve(dev) >= 0));
        return 0;
 }

diff --git a/system.h b/system.h
index a2bcf044e96e469e1274b98c4d652a8f2ee6a4e9..760041731f33a97e9e227abb59704b8d414726f4 100644 (file)
--- a/system.h
+++ b/system.h
@@ -32,6 +32,7 @@ int system_bridge_delif(struct device *bridge, struct device *dev);
 int system_vlan_add(struct device *dev, int id);
 int system_vlan_del(struct device *dev);
 
+void system_if_clear_state(struct device *dev);
 int system_if_up(struct device *dev);
 int system_if_down(struct device *dev);
 int system_if_check(struct device *dev);