X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=dd2823d2f9cc9ecd7f7a0aef3067f52f43cba2df;hp=54638e7c25fb7e1bb85886ebbb8ff4886c0bb368;hb=c68587663ef18fa87841be0a5281264361fab411;hpb=0358e84210b5c97b82b256a5909365555a5f7131

diff --git a/device.c b/device.c
index 54638e7..dd2823d 100644
--- a/device.c
+++ b/device.c
@@ -29,10 +29,10 @@
 #include "config.h"
 
 static struct avl_tree devices;
+static bool default_ps = true;
 
 static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
 	[DEV_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
-	[DEV_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_ARRAY },
 	[DEV_ATTR_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
 	[DEV_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
 	[DEV_ATTR_TXQUEUELEN] = { .name = "txqueuelen", .type = BLOBMSG_TYPE_INT32 },
@@ -43,6 +43,9 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
 	[DEV_ATTR_ACCEPTLOCAL] = { .name = "acceptlocal", .type = BLOBMSG_TYPE_BOOL },
 	[DEV_ATTR_IGMPVERSION] = { .name = "igmpversion", .type = BLOBMSG_TYPE_INT32 },
 	[DEV_ATTR_MLDVERSION] = { .name = "mldversion", .type = BLOBMSG_TYPE_INT32 },
+	[DEV_ATTR_NEIGHREACHABLETIME] = { .name = "neighreachabletime", .type = BLOBMSG_TYPE_INT32 },
+	[DEV_ATTR_RPS] = { .name = "rps", .type = BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_XPS] = { .name = "xps", .type = BLOBMSG_TYPE_BOOL },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -162,6 +165,10 @@ device_merge_settings(struct device *dev, struct device_settings *n)
 	n->acceptlocal = s->flags & DEV_OPT_ACCEPTLOCAL ? s->acceptlocal : os->acceptlocal;
 	n->igmpversion = s->flags & DEV_OPT_IGMPVERSION ? s->igmpversion : os->igmpversion;
 	n->mldversion = s->flags & DEV_OPT_MLDVERSION ? s->mldversion : os->mldversion;
+	n->neigh4reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
+		s->neigh4reachabletime : os->neigh4reachabletime;
+	n->neigh6reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
+			s->neigh6reachabletime : os->neigh6reachabletime;
 	n->flags = s->flags | os->flags;
 }
 
@@ -233,6 +240,25 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
 			DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur));
 	}
 
+	if ((cur = tb[DEV_ATTR_NEIGHREACHABLETIME])) {
+		s->neigh6reachabletime = s->neigh4reachabletime = blobmsg_get_u32(cur);
+		s->flags |= DEV_OPT_NEIGHREACHABLETIME;
+	}
+
+	if ((cur = tb[DEV_ATTR_RPS])) {
+		s->rps = blobmsg_get_bool(cur);
+		s->flags |= DEV_OPT_RPS;
+	}
+	else
+		s->rps = default_ps;
+
+	if ((cur = tb[DEV_ATTR_XPS])) {
+		s->xps = blobmsg_get_bool(cur);
+		s->flags |= DEV_OPT_XPS;
+	}
+	else
+		s->xps = default_ps;
+
 	device_set_disabled(dev, disabled);
 }
 
@@ -349,6 +375,8 @@ int device_init(struct device *dev, const struct device_type *type, const char *
 
 	system_if_clear_state(dev);
 	device_check_state(dev);
+	dev->settings.rps = default_ps;
+	dev->settings.xps = default_ps;
 
 	return 0;
 }
@@ -586,7 +614,7 @@ device_init_pending(void)
 	}
 }
 
-enum dev_change_type
+static enum dev_change_type
 device_set_config(struct device *dev, const struct device_type *type,
 		  struct blob_attr *attr)
 {
@@ -700,6 +728,41 @@ device_reset_old(void)
 	}
 }
 
+void
+device_set_default_ps(bool state)
+{
+	struct device *dev;
+
+	if (state == default_ps)
+		return;
+
+	default_ps = state;
+
+	avl_for_each_element(&devices, dev, avl) {
+		struct device_settings *s = &dev->settings;
+		unsigned int apply_mask = 0;
+
+		if (!(s->flags & DEV_OPT_RPS)) {
+			s->rps = default_ps;
+			apply_mask |= DEV_OPT_RPS;
+		}
+
+		if (!(s->flags & DEV_OPT_XPS)) {
+			s->xps = default_ps;
+			apply_mask |= DEV_OPT_XPS;
+		}
+
+		if (!apply_mask)
+			continue;
+
+		if (!(dev->external || (dev->present && dev->active)) ||
+				dev->config_pending)
+			continue;
+
+		system_if_apply_settings(dev, s, apply_mask);
+	}
+}
+
 struct device *
 device_create(const char *name, const struct device_type *type,
 	      struct blob_attr *config)
@@ -735,8 +798,10 @@ device_create(const char *name, const struct device_type *type,
 	if (odev)
 		device_replace(dev, odev);
 
-	if (!config_init && dev->config_pending)
+	if (!config_init && dev->config_pending) {
 		type->config_init(dev);
+		dev->config_pending = false;
+	}
 
 	return dev;
 }
@@ -794,6 +859,10 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 			blobmsg_add_u32(b, "igmpversion", st.igmpversion);
 		if (st.flags & DEV_OPT_MLDVERSION)
 			blobmsg_add_u32(b, "mldversion", st.mldversion);
+		if (st.flags & DEV_OPT_NEIGHREACHABLETIME) {
+			blobmsg_add_u32(b, "neigh4reachabletime", st.neigh4reachabletime);
+			blobmsg_add_u32(b, "neigh6reachabletime", st.neigh6reachabletime);
+		}
 	}
 
 	s = blobmsg_open_table(b, "statistics");