nterface-ip: remove superfluous iface check in interface_ip_set_enabled()

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 43881e5..09998f4 100644 (file)
--- a/device.c
+++ b/device.c
@@ -32,7 +32,6 @@
 
 static struct list_head devtypes = LIST_HEAD_INIT(devtypes);
 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 },
@@ -49,8 +48,6 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [DEV_ATTR_MLDVERSION] = { .name = "mldversion", .type = BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_NEIGHREACHABLETIME] = { .name = "neighreachabletime", .type = BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_NEIGHGCSTALETIME] = { .name = "neighgcstaletime", .type = BLOBMSG_TYPE_INT32 },
-       [DEV_ATTR_RPS] = { .name = "rps", .type = BLOBMSG_TYPE_BOOL },
-       [DEV_ATTR_XPS] = { .name = "xps", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_DADTRANSMITS] = { .name = "dadtransmits", .type = BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_MULTICAST_TO_UNICAST] = { .name = "multicast_to_unicast", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_MULTICAST_ROUTER] = { .name = "multicast_router", .type = BLOBMSG_TYPE_INT32 },
@@ -59,6 +56,8 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [DEV_ATTR_LEARNING] = { .name ="learning", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_UNICAST_FLOOD] = { .name ="unicast_flood", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_SENDREDIRECTS] = { .name = "sendredirects", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_NEIGHLOCKTIME] = { .name = "neighlocktime", .type = BLOBMSG_TYPE_INT32 },
+       [DEV_ATTR_ISOLATE] = { .name = "isolate", .type = BLOBMSG_TYPE_BOOL },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -189,7 +188,7 @@ struct device_type simple_device_type = {
        .free = simple_device_free,
 };
 
-static void
+void
 device_merge_settings(struct device *dev, struct device_settings *n)
 {
        struct device_settings *os = &dev->orig_settings;
@@ -217,6 +216,8 @@ device_merge_settings(struct device *dev, struct device_settings *n)
                s->neigh4gcstaletime : os->neigh4gcstaletime;
        n->neigh6gcstaletime = s->flags & DEV_OPT_NEIGHGCSTALETIME ?
                s->neigh6gcstaletime : os->neigh6gcstaletime;
+       n->neigh4locktime = s->flags & DEV_OPT_NEIGHLOCKTIME ?
+               s->neigh4locktime : os->neigh4locktime;
        n->dadtransmits = s->flags & DEV_OPT_DADTRANSMITS ?
                s->dadtransmits : os->dadtransmits;
        n->multicast = s->flags & DEV_OPT_MULTICAST ?
@@ -314,19 +315,10 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                s->flags |= DEV_OPT_NEIGHGCSTALETIME;
        }
 
-       if ((cur = tb[DEV_ATTR_RPS])) {
-               s->rps = blobmsg_get_bool(cur);
-               s->flags |= DEV_OPT_RPS;
+       if ((cur = tb[DEV_ATTR_NEIGHLOCKTIME])) {
+               s->neigh4locktime = blobmsg_get_u32(cur);
+               s->flags |= DEV_OPT_NEIGHLOCKTIME;
        }
-       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;
 
        if ((cur = tb[DEV_ATTR_DADTRANSMITS])) {
                s->dadtransmits = blobmsg_get_u32(cur);
@@ -371,6 +363,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                s->flags |= DEV_OPT_SENDREDIRECTS;
        }
 
+       if ((cur = tb[DEV_ATTR_ISOLATE])) {
+               s->isolate = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_ISOLATE;
+       }
+
        device_set_disabled(dev, disabled);
 }
 
@@ -504,8 +501,6 @@ int device_init(struct device *dev, struct device_type *type, const char *ifname
 
        system_if_clear_state(dev);
        device_check_state(dev);
-       dev->settings.rps = default_ps;
-       dev->settings.xps = default_ps;
 
        return 0;
 }
@@ -903,41 +898,6 @@ 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, struct device_type *type,
              struct blob_attr *config)
@@ -1044,6 +1004,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                        blobmsg_add_u32(b, "neigh4gcstaletime", st.neigh4gcstaletime);
                        blobmsg_add_u32(b, "neigh6gcstaletime", st.neigh6gcstaletime);
                }
+               if (st.flags & DEV_OPT_NEIGHLOCKTIME)
+                       blobmsg_add_u32(b, "neigh4locktime", st.neigh4locktime);
                if (st.flags & DEV_OPT_DADTRANSMITS)
                        blobmsg_add_u32(b, "dadtransmits", st.dadtransmits);
                if (st.flags & DEV_OPT_MULTICAST_TO_UNICAST)