X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=91cb37a615a8c94c2db9ee002745f1f862206a57;hp=428d0019d752edb813b269b18da538b631e06277;hb=8fb283ca6f9fda0b6cd01a2c7fb6e01ac3c44886;hpb=fb0e4138070d7c2ce723af5780e763af3a1353d8

diff --git a/device.c b/device.c
index 428d001..91cb37a 100644
--- a/device.c
+++ b/device.c
@@ -55,6 +55,41 @@ void device_unlock(void)
 		device_free_unused(NULL);
 }
 
+static int set_device_state(struct device *dev, bool state)
+{
+	if (state)
+		system_if_up(dev);
+	else
+		system_if_down(dev);
+
+	return 0;
+}
+
+static int
+simple_device_set_state(struct device *dev, bool state)
+{
+	struct device *pdev;
+	int ret = 0;
+
+	pdev = dev->parent.dev;
+	if (state && !pdev) {
+		pdev = system_if_get_parent(dev);
+		if (pdev)
+			device_add_user(&dev->parent, pdev);
+	}
+
+	if (pdev) {
+		if (state)
+			ret = device_claim(&dev->parent);
+		else
+			device_release(&dev->parent);
+
+		if (ret < 0)
+			return ret;
+	}
+	return set_device_state(dev, state);
+}
+
 static struct device *
 simple_device_create(const char *name, struct blob_attr *attr)
 {
@@ -66,6 +101,7 @@ simple_device_create(const char *name, struct blob_attr *attr)
 	if (!dev)
 		return NULL;
 
+	dev->set_state = simple_device_set_state;
 	device_init_settings(dev, tb);
 
 	return dev;
@@ -73,6 +109,8 @@ simple_device_create(const char *name, struct blob_attr *attr)
 
 static void simple_device_free(struct device *dev)
 {
+	if (dev->parent.dev)
+		device_remove_user(&dev->parent);
 	device_cleanup(dev);
 	free(dev);
 }
@@ -209,16 +247,6 @@ alias_notify_device(const char *name, struct device *dev)
 	device_unlock();
 }
 
-static int set_device_state(struct device *dev, bool state)
-{
-	if (state)
-		system_if_up(dev);
-	else
-		system_if_down(dev);
-
-	return 0;
-}
-
 int device_claim(struct device_user *dep)
 {
 	struct device *dev = dep->dev;
@@ -315,6 +343,7 @@ device_create_default(const char *name, bool external)
 	D(DEVICE, "Create simple device '%s'\n", name);
 	dev = calloc(1, sizeof(*dev));
 	dev->external = external;
+	dev->set_state = simple_device_set_state;
 	device_init(dev, &simple_device_type, name);
 	dev->default_config = true;
 	return dev;
@@ -401,6 +430,14 @@ void device_add_user(struct device_user *dep, struct device *dev)
 	}
 }
 
+void
+device_free(struct device *dev)
+{
+	__devlock++;
+	dev->type->free(dev);
+	__devlock--;
+}
+
 static void
 __device_free_unused(struct device *dev)
 {