diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2018-11-18 07:28:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-20 10:32:16 +0000 |
commit | 9d0e83fdec065efbea60e435f9226f8371fbc3eb (patch) | |
tree | 83a67c6706656b8c2a84bf5e1f360fb988e1fce8 /meta/recipes-core | |
parent | bf8ceefb8e952139398e48337fb4698dddfe3f18 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch | 36 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_239.bb | 1 |
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 @@ | |||
1 | From 1e190dfd5bb95036f937ef1dc46f43eb0a146612 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com> | ||
3 | Date: Fri, 17 Aug 2018 21:31:05 +0200 | ||
4 | Subject: [PATCH] Revert "sysctl.d: request ECN on both in and outgoing | ||
5 | connections" | ||
6 | |||
7 | Turning on ECN still causes slow or broken network on linux. Our tcp | ||
8 | is not yet ready for wide spread use of ECN. | ||
9 | |||
10 | This reverts commit 919472741dba6ad0a3f6c2b76d390a02d0e2fdc3. | ||
11 | |||
12 | https://github.com/systemd/systemd/issues/9748 | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
16 | --- | ||
17 | sysctl.d/50-default.conf | 3 --- | ||
18 | 1 file changed, 3 deletions(-) | ||
19 | |||
20 | diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf | ||
21 | index 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 | -- | ||
35 | 2.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 |