0d07d179d8
This reverts commit 582635b031.
The segfault issue has disappeared, so the workaround is not needed
anymore.
76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Wed, 24 Jan 2018 20:53:32 +0100
|
|
Subject: netifd: system-linux: VXLAN: add options to enable and disable UDP checksums
|
|
|
|
diff --git a/package/network/config/netifd/patches/0002-system-linux-VXLAN-add-options-to-enable-and-disable.patch b/package/network/config/netifd/patches/0002-system-linux-VXLAN-add-options-to-enable-and-disable.patch
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..67a8bb864be37fa97dfcce4dd841bacafefcd0fc
|
|
--- /dev/null
|
|
+++ b/package/network/config/netifd/patches/0002-system-linux-VXLAN-add-options-to-enable-and-disable.patch
|
|
@@ -0,0 +1,65 @@
|
|
+From af3cadb6a46ba93e8a729e71d82b176275931e62 Mon Sep 17 00:00:00 2001
|
|
+Message-Id: <af3cadb6a46ba93e8a729e71d82b176275931e62.1516821520.git.mschiffer@universe-factory.net>
|
|
+From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
+Date: Wed, 24 Jan 2018 13:21:44 +0100
|
|
+Subject: [PATCH] system-linux: VXLAN: add options to enable and disable UDP
|
|
+ checksums
|
|
+
|
|
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
+---
|
|
+ system-linux.c | 11 +++++++++++
|
|
+ system.c | 2 ++
|
|
+ system.h | 2 ++
|
|
+ 3 files changed, 15 insertions(+)
|
|
+
|
|
+diff --git a/system-linux.c b/system-linux.c
|
|
+index 32d6ffc..0277886 100644
|
|
+--- a/system-linux.c
|
|
++++ b/system-linux.c
|
|
+@@ -2841,6 +2841,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;
|
|
+diff --git a/system.c b/system.c
|
|
+index 5555272..e236e96 100644
|
|
+--- a/system.c
|
|
++++ b/system.c
|
|
+@@ -36,6 +36,8 @@ static const struct blobmsg_policy vxlan_data_attrs[__VXLAN_DATA_ATTR_MAX] = {
|
|
+ [VXLAN_DATA_ATTR_ID] = { .name = "id", .type = BLOBMSG_TYPE_INT32 },
|
|
+ [VXLAN_DATA_ATTR_PORT] = { .name = "port", .type = BLOBMSG_TYPE_INT32 },
|
|
+ [VXLAN_DATA_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
|
|
++ [VXLAN_DATA_ATTR_RXCSUM] = { .name = "rxcsum", .type = BLOBMSG_TYPE_BOOL },
|
|
++ [VXLAN_DATA_ATTR_TXCSUM] = { .name = "txcsum", .type = BLOBMSG_TYPE_BOOL },
|
|
+ };
|
|
+
|
|
+ const struct uci_blob_param_list vxlan_data_attr_list = {
|
|
+diff --git a/system.h b/system.h
|
|
+index 61c72c2..371a524 100644
|
|
+--- a/system.h
|
|
++++ b/system.h
|
|
+@@ -41,6 +41,8 @@ enum vxlan_data {
|
|
+ VXLAN_DATA_ATTR_ID,
|
|
+ VXLAN_DATA_ATTR_PORT,
|
|
+ VXLAN_DATA_ATTR_MACADDR,
|
|
++ VXLAN_DATA_ATTR_RXCSUM,
|
|
++ VXLAN_DATA_ATTR_TXCSUM,
|
|
+ __VXLAN_DATA_ATTR_MAX
|
|
+ };
|
|
+
|
|
+--
|
|
+2.16.1
|
|
+
|