netifd: add netlink udebug ring

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 9a9e24984018ce18885cbdeed44857f5ebbd68ce..839f7ec900a4da022bc98adc1d0c714741bf7633 100644 (file)
--- a/device.c
+++ b/device.c
@@ -72,6 +72,9 @@ 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 },
+       [DEV_ATTR_EEE] = { .name = "eee", .type = BLOBMSG_TYPE_BOOL },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -164,6 +167,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);
@@ -294,6 +299,9 @@ 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->eee = s->flags & DEV_OPT_EEE ? s->eee : os->eee;
+       n->master_ifindex = s->flags & DEV_OPT_MASTER ? s->master_ifindex : os->master_ifindex;
        n->flags = s->flags | os->flags | os->valid_flags;
 }
 
@@ -346,7 +354,10 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
        struct ether_addr *ea;
        bool disabled = false;
 
-       s->flags = 0;
+       if (dev->wireless)
+               s->flags &= DEV_OPT_ISOLATE;
+       else
+               s->flags = 0;
        if ((cur = tb[DEV_ATTR_ENABLED]))
                disabled = !blobmsg_get_bool(cur);
 
@@ -392,7 +403,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                if (system_resolve_rpfilter(blobmsg_data(cur), &s->rpfilter))
                        s->flags |= DEV_OPT_RPFILTER;
                else
-                       DPRINTF("Failed to resolve rpfilter: %s\n", (char *) blobmsg_data(cur));
+                       D(DEVICE, "Failed to resolve rpfilter: %s\n", (char *) blobmsg_data(cur));
        }
 
        if ((cur = tb[DEV_ATTR_ACCEPTLOCAL])) {
@@ -405,7 +416,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                if (s->igmpversion >= 1 && s->igmpversion <= 3)
                        s->flags |= DEV_OPT_IGMPVERSION;
                else
-                       DPRINTF("Failed to resolve igmpversion: %d\n", blobmsg_get_u32(cur));
+                       D(DEVICE, "Failed to resolve igmpversion: %d\n", blobmsg_get_u32(cur));
        }
 
        if ((cur = tb[DEV_ATTR_MLDVERSION])) {
@@ -413,7 +424,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                if (s->mldversion >= 1 && s->mldversion <= 2)
                        s->flags |= DEV_OPT_MLDVERSION;
                else
-                       DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur));
+                       D(DEVICE, "Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur));
        }
 
        if ((cur = tb[DEV_ATTR_NEIGHREACHABLETIME])) {
@@ -446,7 +457,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                if (s->multicast_router <= 2)
                        s->flags |= DEV_OPT_MULTICAST_ROUTER;
                else
-                       DPRINTF("Invalid value: %d - (Use 0: never, 1: learn, 2: always)\n", blobmsg_get_u32(cur));
+                       D(DEVICE, "Invalid value: %d - (Use 0: never, 1: learn, 2: always)\n", blobmsg_get_u32(cur));
        }
 
        if ((cur = tb[DEV_ATTR_MULTICAST_FAST_LEAVE])) {
@@ -544,6 +555,22 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                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;
+       }
+
+       if ((cur = tb[DEV_ATTR_EEE])) {
+               s->eee = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_EEE;
+       }
+
        cur = tb[DEV_ATTR_AUTH_VLAN];
        free(dev->config_auth_vlans);
        dev->config_auth_vlans = cur ? blob_memdup(cur) : NULL;
@@ -616,6 +643,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);
@@ -624,6 +653,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)
@@ -838,9 +883,9 @@ void device_cleanup(struct device *dev)
        device_delete(dev);
 }
 
-static void __device_set_present(struct device *dev, bool state)
+static void __device_set_present(struct device *dev, bool state, bool force)
 {
-       if (dev->present == state)
+       if (dev->present == state && !force)
                return;
 
        dev->present = state;
@@ -855,7 +900,7 @@ device_refresh_present(struct device *dev)
        if (dev->disabled || dev->deferred)
                state = false;
 
-       __device_set_present(dev, state);
+       __device_set_present(dev, state, false);
 }
 
 void
@@ -895,7 +940,10 @@ void device_set_present(struct device *dev, bool state)
 
        D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
        dev->sys_present = state;
-       device_refresh_present(dev);
+       if (!state)
+               __device_set_present(dev, state, true);
+       else
+               device_refresh_present(dev);
        if (!state)
                safe_list_for_each(&dev->users, device_release_cb, NULL);
 }
@@ -1284,6 +1332,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)
@@ -1344,6 +1399,10 @@ 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);
+               if (st.flags & DEV_OPT_EEE)
+                       blobmsg_add_u8(b, "eee", st.eee);
        }
 
        s = blobmsg_open_table(b, "statistics");