system-linux: add option to configure DSA conduit device

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index ec4f11b8e8fda227d8e5d0a3b5dd7fb101bcd029..3ad1563b79a2d734b88c5952cfc90e2d43ffc3d8 100644 (file)
--- a/device.c
+++ b/device.c
@@ -63,6 +63,7 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [DEV_ATTR_DROP_UNSOLICITED_NA] = { .name = "drop_unsolicited_na", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_ARP_ACCEPT] = { .name = "arp_accept", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_AUTH] = { .name = "auth", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_AUTH_VLAN] = { .name = "auth_vlan", BLOBMSG_TYPE_ARRAY },
        [DEV_ATTR_SPEED] = { .name = "speed", .type = BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_DUPLEX] = { .name = "duplex", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_VLAN] = { .name = "vlan", .type = BLOBMSG_TYPE_ARRAY },
@@ -71,6 +72,8 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [DEV_ATTR_RXPAUSE] = { .name = "rxpause", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_TXPAUSE] = { .name = "txpause", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_AUTONEG] = { .name = "autoneg", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_GRO] = { .name = "gro", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_MASTER] = { .name = "conduit", .type = BLOBMSG_TYPE_STRING },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -163,6 +166,8 @@ static int set_device_state(struct device *dev, bool state)
                system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
 
                system_if_up(dev);
+
+               system_if_apply_settings_after_up(dev, &dev->settings);
        } else {
                system_if_down(dev);
                system_if_apply_settings(dev, &dev->orig_settings, dev->orig_settings.flags);
@@ -293,6 +298,8 @@ device_merge_settings(struct device *dev, struct device_settings *n)
        n->rxpause = s->flags & DEV_OPT_RXPAUSE ? s->rxpause : os->rxpause;
        n->txpause = s->flags & DEV_OPT_TXPAUSE ? s->txpause : os->txpause;
        n->autoneg = s->flags & DEV_OPT_AUTONEG ? s->autoneg : os->autoneg;
+       n->gro = s->flags & DEV_OPT_GRO ? s->gro : os->gro;
+       n->master_ifindex = s->flags & DEV_OPT_MASTER ? s->master_ifindex : os->master_ifindex;
        n->flags = s->flags | os->flags | os->valid_flags;
 }
 
@@ -542,6 +549,22 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                s->autoneg = blobmsg_get_bool(cur);
                s->flags |= DEV_OPT_AUTONEG;
        }
+
+       if ((cur = tb[DEV_ATTR_GRO])) {
+               s->gro = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_GRO;
+       }
+
+       if ((cur = tb[DEV_ATTR_MASTER])) {
+               char *ifname = blobmsg_get_string(cur);
+               s->master_ifindex = if_nametoindex(ifname);
+               s->flags |= DEV_OPT_MASTER;
+       }
+
+       cur = tb[DEV_ATTR_AUTH_VLAN];
+       free(dev->config_auth_vlans);
+       dev->config_auth_vlans = cur ? blob_memdup(cur) : NULL;
+
        device_set_extra_vlans(dev, tb[DEV_ATTR_VLAN]);
        device_set_disabled(dev, disabled);
 }
@@ -610,6 +633,8 @@ device_fill_default_settings(struct device *dev)
 {
        struct device_settings *s = &dev->settings;
        struct ether_addr *ea;
+       const char *master;
+       int ret;
 
        if (!(s->flags & DEV_OPT_MACADDR)) {
                ea = config_get_default_macaddr(dev->ifname);
@@ -618,6 +643,22 @@ device_fill_default_settings(struct device *dev)
                        s->flags |= DEV_OPT_DEFAULT_MACADDR;
                }
        }
+
+       if (!(s->flags & DEV_OPT_GRO)) {
+               ret = config_get_default_gro(dev->ifname);
+               if (ret >= 0) {
+                       s->gro = ret;
+                       s->flags |= DEV_OPT_GRO;
+               }
+       }
+
+       if (!(s->flags & DEV_OPT_MASTER)) {
+               master = config_get_default_conduit(dev->ifname);
+               if (master) {
+                       s->master_ifindex = if_nametoindex(master);
+                       s->flags |= DEV_OPT_MASTER;
+               }
+       }
 }
 
 int device_claim(struct device_user *dep)
@@ -1000,6 +1041,7 @@ device_free(struct device *dev)
        free(dev->auth_vlans);
        free(dev->config);
        device_cleanup(dev);
+       free(dev->config_auth_vlans);
        free(dev->extra_vlan);
        dev->type->free(dev);
        __devlock--;
@@ -1277,6 +1319,13 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 
        if (dev->active) {
                device_merge_settings(dev, &st);
+               if (st.flags & DEV_OPT_MASTER) {
+                       char buf[64], *devname;
+
+                       devname = if_indextoname(st.master_ifindex, buf);
+                       if (devname)
+                               blobmsg_add_string(b, "conduit", devname);
+               }
                if (st.flags & DEV_OPT_MTU)
                        blobmsg_add_u32(b, "mtu", st.mtu);
                if (st.flags & DEV_OPT_MTU6)
@@ -1337,6 +1386,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                        blobmsg_add_u8(b, "arp_accept", st.arp_accept);
                if (st.flags & DEV_OPT_AUTH)
                        blobmsg_add_u8(b, "auth", st.auth);
+               if (st.flags & DEV_OPT_GRO)
+                       blobmsg_add_u8(b, "gro", st.gro);
        }
 
        s = blobmsg_open_table(b, "statistics");