X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=0560a708705772cd74ea562179163cc1833c000c;hp=7253bb99bdeb1191ef510212d731fce4b52c7544;hb=0f738b8f6c5d89ad5130c74a8dcb9a1df9a190bc;hpb=fcbec58e1494281dfeb2f19576c52667a512fad2

diff --git a/device.c b/device.c
index 7253bb9..0560a70 100644
--- a/device.c
+++ b/device.c
@@ -112,7 +112,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 +161,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);
@@ -175,35 +172,53 @@ static const struct device_type alias_device_type = {
 	.free = alias_device_free,
 };
 
+static void
+device_merge_settings(struct device *dev, struct device_settings *n)
+{
+	struct device_settings *os = &dev->orig_settings;
+	struct device_settings *s = &dev->settings;
+
+	memset(n, 0, sizeof(*n));
+	n->mtu = s->flags & DEV_OPT_MTU ? s->mtu : os->mtu;
+	n->txqueuelen = s->flags & DEV_OPT_TXQUEUELEN ?
+		s->txqueuelen : os->txqueuelen;
+	memcpy(n->macaddr,
+		(s->flags & DEV_OPT_MACADDR ? s->macaddr : os->macaddr),
+		sizeof(n->macaddr));
+	n->flags = s->flags | os->flags;
+}
+
 void
 device_init_settings(struct device *dev, struct blob_attr **tb)
 {
+	struct device_settings *s = &dev->settings;
 	struct blob_attr *cur;
 	struct ether_addr *ea;
+	bool disabled = false;
 
-	dev->flags = 0;
-	dev->disabled = false;
-
+	s->flags = 0;
 	if ((cur = tb[DEV_ATTR_ENABLED]))
-		device_set_disabled(dev, !blobmsg_get_bool(cur));
+		disabled = !blobmsg_get_bool(cur);
 
 	if ((cur = tb[DEV_ATTR_MTU])) {
-		dev->mtu = blobmsg_get_u32(cur);
-		dev->flags |= DEV_OPT_MTU;
+		s->mtu = blobmsg_get_u32(cur);
+		s->flags |= DEV_OPT_MTU;
 	}
 
 	if ((cur = tb[DEV_ATTR_TXQUEUELEN])) {
-		dev->txqueuelen = blobmsg_get_u32(cur);
-		dev->flags |= DEV_OPT_TXQUEUELEN;
+		s->txqueuelen = blobmsg_get_u32(cur);
+		s->flags |= DEV_OPT_TXQUEUELEN;
 	}
 
 	if ((cur = tb[DEV_ATTR_MACADDR])) {
-		ea = ether_aton(blob_data(cur));
+		ea = ether_aton(blobmsg_data(cur));
 		if (ea) {
-			memcpy(dev->macaddr, ea, sizeof(dev->macaddr));
-			dev->flags |= DEV_OPT_MACADDR;
+			memcpy(s->macaddr, ea, 6);
+			s->flags |= DEV_OPT_MACADDR;
 		}
 	}
+
+	device_set_disabled(dev, disabled);
 }
 
 static void __init dev_init(void)
@@ -294,7 +309,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);
 }
 
@@ -447,6 +463,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) {
@@ -460,6 +482,8 @@ void
 device_free(struct device *dev)
 {
 	__devlock++;
+	free(dev->config);
+	device_cleanup(dev);
 	dev->type->free(dev);
 	__devlock--;
 }
@@ -532,7 +556,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;
 }
@@ -612,11 +636,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);
 			}
@@ -651,6 +676,7 @@ device_create(const char *name, const struct device_type *type,
 void
 device_dump_status(struct blob_buf *b, struct device *dev)
 {
+	struct device_settings st;
 	void *c, *s;
 
 	if (!dev) {
@@ -675,6 +701,16 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 	else
 		system_if_dump_info(dev, b);
 
+	if (dev->active) {
+		device_merge_settings(dev, &st);
+		if (st.flags & DEV_OPT_MTU)
+			blobmsg_add_u32(b, "mtu", st.mtu);
+		if (st.flags & DEV_OPT_MACADDR)
+			blobmsg_add_string(b, "macaddr", ether_ntoa((struct ether_addr *) st.macaddr));
+		if (st.flags & DEV_OPT_TXQUEUELEN)
+			blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
+	}
+
 	s = blobmsg_open_table(b, "statistics");
 	if (dev->type->dump_stats)
 		dev->type->dump_stats(dev, b);