Add mtu6 option to override IPv6 MTU

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 3ca867c..1265c86 100644 (file)
--- a/device.c
+++ b/device.c
@@ -29,11 +29,12 @@
 #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_MTU6] = { .name = "mtu6", .type = BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
        [DEV_ATTR_TXQUEUELEN] = { .name = "txqueuelen", .type = BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_ENABLED] = { .name = "enabled", .type = BLOBMSG_TYPE_BOOL },
@@ -154,6 +155,7 @@ device_merge_settings(struct device *dev, struct device_settings *n)
 
        memset(n, 0, sizeof(*n));
        n->mtu = s->flags & DEV_OPT_MTU ? s->mtu : os->mtu;
+       n->mtu6 = s->flags & DEV_OPT_MTU6 ? s->mtu6 : os->mtu6;
        n->txqueuelen = s->flags & DEV_OPT_TXQUEUELEN ?
                s->txqueuelen : os->txqueuelen;
        memcpy(n->macaddr,
@@ -189,6 +191,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                s->flags |= DEV_OPT_MTU;
        }
 
+       if ((cur = tb[DEV_ATTR_MTU6])) {
+               s->mtu6 = blobmsg_get_u32(cur);
+               s->flags |= DEV_OPT_MTU6;
+       }
+
        if ((cur = tb[DEV_ATTR_TXQUEUELEN])) {
                s->txqueuelen = blobmsg_get_u32(cur);
                s->flags |= DEV_OPT_TXQUEUELEN;
@@ -245,15 +252,19 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                s->flags |= DEV_OPT_NEIGHREACHABLETIME;
        }
 
-       if ((cur = tb[DEV_ATTR_RPS]))
+       if ((cur = tb[DEV_ATTR_RPS])) {
                s->rps = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_RPS;
+       }
        else
-               s->rps = true;
+               s->rps = default_ps;
 
-       if ((cur = tb[DEV_ATTR_XPS]))
+       if ((cur = tb[DEV_ATTR_XPS])) {
                s->xps = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_XPS;
+       }
        else
-               s->xps = true;
+               s->xps = default_ps;
 
        device_set_disabled(dev, disabled);
 }
@@ -371,6 +382,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;
 }
@@ -722,6 +735,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)
@@ -757,8 +805,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;
 }
@@ -800,6 +850,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                device_merge_settings(dev, &st);
                if (st.flags & DEV_OPT_MTU)
                        blobmsg_add_u32(b, "mtu", st.mtu);
+               if (st.flags & DEV_OPT_MTU6)
+                       blobmsg_add_u32(b, "mtu6", st.mtu6);
                if (st.flags & DEV_OPT_MACADDR)
                        blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
                if (st.flags & DEV_OPT_TXQUEUELEN)