summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2018-11-18 07:28:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-20 10:32:16 +0000
commit9d0e83fdec065efbea60e435f9226f8371fbc3eb (patch)
tree83a67c6706656b8c2a84bf5e1f360fb988e1fce8
parentbf8ceefb8e952139398e48337fb4698dddfe3f18 (diff)
downloadpoky-9d0e83fdec065efbea60e435f9226f8371fbc3eb.tar.gz
systemd: backport fix to stop enabling ECN
>From upstream: Turning on ECN still causes slow or broken network on linux. Our tcp is not yet ready for wide spread use of ECN. https://github.com/systemd/systemd/issues/9748 (From OE-Core rev: f951aa6f9fcf318f108ecdc3371498ee2e919e68) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch36
-rw-r--r--meta/recipes-core/systemd/systemd_239.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch b/meta/recipes-core/systemd/systemd/0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch
new file mode 100644
index 0000000000..7fd6d0188e
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch
@@ -0,0 +1,36 @@
1From 1e190dfd5bb95036f937ef1dc46f43eb0a146612 Mon Sep 17 00:00:00 2001
2From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
3Date: Fri, 17 Aug 2018 21:31:05 +0200
4Subject: [PATCH] Revert "sysctl.d: request ECN on both in and outgoing
5 connections"
6
7Turning on ECN still causes slow or broken network on linux. Our tcp
8is not yet ready for wide spread use of ECN.
9
10This reverts commit 919472741dba6ad0a3f6c2b76d390a02d0e2fdc3.
11
12https://github.com/systemd/systemd/issues/9748
13
14Upstream-Status: Backport
15Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
16---
17 sysctl.d/50-default.conf | 3 ---
18 1 file changed, 3 deletions(-)
19
20diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
21index b67ae87ca6b7..e263cf06284a 100644
22--- a/sysctl.d/50-default.conf
23+++ b/sysctl.d/50-default.conf
24@@ -33,9 +33,6 @@ net.ipv4.conf.all.promote_secondaries = 1
25 # Fair Queue CoDel packet scheduler to fight bufferbloat
26 net.core.default_qdisc = fq_codel
27
28-# Request Explicit Congestion Notification (ECN) on both in and outgoing connections
29-net.ipv4.tcp_ecn = 1
30-
31 # Enable hard and soft link protection
32 fs.protected_hardlinks = 1
33 fs.protected_symlinks = 1
34--
352.7.4
36
diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb
index 3dbeaac342..e19a8babce 100644
--- a/meta/recipes-core/systemd/systemd_239.bb
+++ b/meta/recipes-core/systemd/systemd_239.bb
@@ -33,6 +33,7 @@ SRC_URI += "file://touchscreen.rules \
33 file://0001-core-when-deserializing-state-always-use-read_line-L.patch \ 33 file://0001-core-when-deserializing-state-always-use-read_line-L.patch \
34 file://0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch \ 34 file://0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch \
35 file://0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch \ 35 file://0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch \
36 file://0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch \
36 " 37 "
37 38
38# patches made for musl are only applied on TCLIBC is musl 39# patches made for musl are only applied on TCLIBC is musl