X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=0ca525602d9ea63ac5b845b2be9c6c7bdec7c26c;hp=6d97a02961c788d30275107816d8dbf298e7111f;hb=3dc8c916a94483bba2eed5ba34ccfc864866bb4e;hpb=7d94ede3c38dd7b8e08c8a2fd8ae5ede71a2059b

diff --git a/system-linux.c b/system-linux.c
index 6d97a02..0ca5256 100644
--- 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" :
@@ -543,16 +548,20 @@ out:
 static void
 handle_hotplug_msg(char *data, int size)
 {
-	const char *subsystem = NULL, *interface = NULL;
+	const char *subsystem = NULL, *interface = NULL, *interface_old = NULL;
 	char *cur, *end, *sep;
 	struct device *dev;
 	int skip;
-	bool add;
+	bool add, move = false;
 
 	if (!strncmp(data, "add@", 4))
 		add = true;
 	else if (!strncmp(data, "remove@", 7))
 		add = false;
+	else if (!strncmp(data, "move@", 5)) {
+		add = true;
+		move = true;
+	}
 	else
 		return;
 
@@ -573,12 +582,32 @@ handle_hotplug_msg(char *data, int size)
 			subsystem = sep + 1;
 			if (strcmp(subsystem, "net") != 0)
 				return;
+		} else if (!strcmp(cur, "DEVPATH_OLD")) {
+			interface_old = strrchr(sep + 1, '/');
+			if (interface_old)
+				interface_old++;
 		}
-		if (subsystem && interface)
+	}
+
+	if (subsystem && interface) {
+		if (move && interface_old)
+			goto move;
+		else
 			goto found;
 	}
+
 	return;
 
+move:
+	dev = device_find(interface_old);
+	if (!dev)
+		goto found;
+
+	if (dev->type != &simple_device_type)
+		goto found;
+
+	device_set_present(dev, false);
+
 found:
 	dev = device_find(interface);
 	if (!dev)
@@ -724,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;
 }
 
@@ -1387,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)
 {
@@ -1502,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)
@@ -2817,6 +2808,17 @@ static int system_add_vxlan(const char *name, const unsigned int link, struct bl
 	}
 	nla_put_u16(msg, IFLA_VXLAN_PORT, htons(port));
 
+	if ((cur = tb_data[VXLAN_DATA_ATTR_RXCSUM])) {
+		bool rxcsum = blobmsg_get_bool(cur);
+		nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, !rxcsum);
+	}
+
+	if ((cur = tb_data[VXLAN_DATA_ATTR_TXCSUM])) {
+		bool txcsum = blobmsg_get_bool(cur);
+		nla_put_u8(msg, IFLA_VXLAN_UDP_CSUM, txcsum);
+		nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_TX, !txcsum);
+	}
+
 	if ((cur = tb[TUNNEL_ATTR_TOS])) {
 		char *str = blobmsg_get_string(cur);
 		unsigned tos = 1;