system-linux: remove unnecessary open call in system_if_dump_info()

[project/netifd.git] / system-linux.c

diff --git a/system-linux.c b/system-linux.c
index 0277886..3cdf3e4 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -346,6 +346,11 @@ static void system_bridge_set_hairpin_mode(struct device *dev, const char *val)
        system_set_dev_sysctl("/sys/class/net/%s/brport/hairpin_mode", dev->ifname, val);
 }
 
+static void system_bridge_set_isolate_mode(struct device *dev, const char *val)
+{
+       system_set_dev_sysctl("/sys/class/net/%s/brport/isolate_mode", dev->ifname, val);
+}
+
 static void system_bridge_set_multicast_router(struct device *dev, const char *val, bool bridge)
 {
        system_set_dev_sysctl(bridge ? "/sys/class/net/%s/bridge/multicast_router" :
@@ -748,6 +753,10 @@ int system_bridge_addif(struct device *bridge, struct device *dev)
            !dev->settings.unicast_flood)
                system_bridge_set_unicast_flood(dev, "0");
 
+       if (dev->settings.flags & DEV_OPT_ISOLATE &&
+           dev->settings.isolate)
+               system_bridge_set_isolate_mode(dev, "1");
+
        return ret;
 }
 
@@ -1411,46 +1420,6 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
        }
 }
 
-static void
-system_if_set_rps_xps_val(const char *path, char *fmt, int val)
-{
-       char val_buf[8];
-       glob_t gl;
-       int i;
-
-       if (glob(path, 0, NULL, &gl))
-               return;
-
-       snprintf(val_buf, sizeof(val_buf), fmt, val);
-       for (i = 0; i < gl.gl_pathc; i++)
-               system_set_sysctl(gl.gl_pathv[i], val_buf);
-
-       globfree(&gl);
-}
-
-static void
-system_if_apply_rps_xps(struct device *dev, struct device_settings *s)
-{
-       long n_cpus = sysconf(_SC_NPROCESSORS_ONLN);
-       int val, rps_val, rps_flow_cnt, xps_val;
-
-       if (n_cpus < 2)
-               return;
-
-       val = (1 << n_cpus) - 1;
-       rps_val = s->rps_val ? s->rps_val : val;
-       snprintf(dev_buf, sizeof(dev_buf), "/sys/class/net/%s/queues/*/rps_cpus", dev->ifname);
-       system_if_set_rps_xps_val(dev_buf, "%x", s->rps ? rps_val : 0);
-
-       rps_flow_cnt = s->rps_flow_cnt ? s->rps_flow_cnt : 0;
-       snprintf(dev_buf, sizeof(dev_buf), "/sys/class/net/%s/queues/*/rps_flow_cnt", dev->ifname);
-       system_if_set_rps_xps_val(dev_buf, "%d", s->rps ? rps_flow_cnt : 0);
-
-       xps_val = s->xps_val ? s->xps_val : val;
-       snprintf(dev_buf, sizeof(dev_buf), "/sys/class/net/%s/queues/*/xps_cpus", dev->ifname);
-       system_if_set_rps_xps_val(dev_buf, "%x", s->xps ? xps_val : 0);
-}
-
 void
 system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned int apply_mask)
 {
@@ -1526,8 +1495,6 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
        }
        if (s->flags & DEV_OPT_SENDREDIRECTS & apply_mask)
                system_set_sendredirects(dev, s->sendredirects ? "1" : "0");
-
-       system_if_apply_rps_xps(dev, s);
 }
 
 int system_if_up(struct device *dev)
@@ -1741,16 +1708,12 @@ system_if_dump_info(struct device *dev, struct blob_buf *b)
 {
        struct ethtool_cmd ecmd;
        struct ifreq ifr;
-       char buf[64], *s;
+       char *s;
        void *c;
-       int dir_fd;
-
-       snprintf(buf, sizeof(buf), "/sys/class/net/%s", dev->ifname);
-       dir_fd = open(buf, O_DIRECTORY);
 
        memset(&ecmd, 0, sizeof(ecmd));
        memset(&ifr, 0, sizeof(ifr));
-       strcpy(ifr.ifr_name, dev->ifname);
+       strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
        ifr.ifr_data = (caddr_t) &ecmd;
        ecmd.cmd = ETHTOOL_GSET;
 
@@ -1769,7 +1732,6 @@ system_if_dump_info(struct device *dev, struct blob_buf *b)
                blobmsg_add_string_buffer(b);
        }
 
-       close(dir_fd);
        return 0;
 }
 
@@ -2857,8 +2819,10 @@ static int system_add_vxlan(const char *name, const unsigned int link, struct bl
                unsigned tos = 1;
 
                if (strcmp(str, "inherit")) {
-                       if (!system_tos_aton(str, &tos))
-                               return -EINVAL;
+                       if (!system_tos_aton(str, &tos)) {
+                               ret = -EINVAL;
+                               goto failure;
+                       }
                }
 
                nla_put_u8(msg, IFLA_VXLAN_TOS, tos);