device: ignore MTU values below minimum

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 8174ca0..82596e4 100644 (file)
--- a/device.c
+++ b/device.c
@@ -54,6 +54,7 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [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 },
+       [DEV_ATTR_MULTICAST_FAST_LEAVE] = { .name = "multicast_fast_leave", . type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_MULTICAST] = { .name ="multicast", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_LEARNING] = { .name ="learning", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_UNICAST_FLOOD] = { .name ="unicast_flood", .type = BLOBMSG_TYPE_BOOL },
@@ -81,16 +82,6 @@ int device_type_add(struct device_type *devtype)
        return 0;
 }
 
-/* initialize device type list and add known types */
-static void __init devtypes_init(void)
-{
-       device_type_add(&simple_device_type);
-       device_type_add(&bridge_device_type);
-       device_type_add(&tunnel_device_type);
-       device_type_add(&macvlan_device_type);
-       device_type_add(&vlandev_device_type);
-}
-
 /* Retrieve the device type for the given name. If 'bridge' is true, the type
  * must have bridge capabilities
  */
@@ -231,6 +222,7 @@ device_merge_settings(struct device *dev, struct device_settings *n)
                s->multicast : os->multicast;
        n->multicast_to_unicast = s->multicast_to_unicast;
        n->multicast_router = s->multicast_router;
+       n->multicast_fast_leave = s->multicast_fast_leave;
        n->learning = s->learning;
        n->unicast_flood = s->unicast_flood;
        n->flags = s->flags | os->flags | os->valid_flags;
@@ -248,12 +240,12 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
        if ((cur = tb[DEV_ATTR_ENABLED]))
                disabled = !blobmsg_get_bool(cur);
 
-       if ((cur = tb[DEV_ATTR_MTU])) {
+       if ((cur = tb[DEV_ATTR_MTU]) && blobmsg_get_u32(cur) >= 68) {
                s->mtu = blobmsg_get_u32(cur);
                s->flags |= DEV_OPT_MTU;
        }
 
-       if ((cur = tb[DEV_ATTR_MTU6])) {
+       if ((cur = tb[DEV_ATTR_MTU6]) && blobmsg_get_u32(cur) >= 1280) {
                s->mtu6 = blobmsg_get_u32(cur);
                s->flags |= DEV_OPT_MTU6;
        }
@@ -351,6 +343,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                        DPRINTF("Invalid value: %d - (Use 0: never, 1: learn, 2: always)\n", blobmsg_get_u32(cur));
        }
 
+       if ((cur = tb[DEV_ATTR_MULTICAST_FAST_LEAVE])) {
+               s->multicast_fast_leave = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_MULTICAST_FAST_LEAVE;
+       }
+
        if ((cur = tb[DEV_ATTR_MULTICAST])) {
                s->multicast = blobmsg_get_bool(cur);
                s->flags |= DEV_OPT_MULTICAST;
@@ -453,6 +450,10 @@ void device_release(struct device_user *dep)
        device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
        if (!dev->external)
                dev->set_state(dev, false);
+
+       if (dev->active)
+               return;
+
        device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
 
@@ -1041,6 +1042,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                        blobmsg_add_u8(b, "multicast_to_unicast", st.multicast_to_unicast);
                if (st.flags & DEV_OPT_MULTICAST_ROUTER)
                        blobmsg_add_u32(b, "multicast_router", st.multicast_router);
+               if (st.flags & DEV_OPT_MULTICAST_FAST_LEAVE)
+                       blobmsg_add_u8(b, "multicast_fast_leave", st.multicast_fast_leave);
                if (st.flags & DEV_OPT_MULTICAST)
                        blobmsg_add_u8(b, "multicast", st.multicast);
                if (st.flags & DEV_OPT_LEARNING)
@@ -1056,3 +1059,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                system_if_dump_stats(dev, b);
        blobmsg_close_table(b, s);
 }
+
+static void __init simple_device_type_init(void)
+{
+       device_type_add(&simple_device_type);
+}