803fb7
From 7b7707f0892a1d64c310aa86009b42da84d03bf8 Mon Sep 17 00:00:00 2001
803fb7
From: Lukas Nykryn <lnykryn@redhat.com>
803fb7
Date: Tue, 15 Sep 2015 12:50:08 +0200
803fb7
Subject: [PATCH] Revert "sysctl.d: default to fq_codel, fight bufferbloat"
803fb7
803fb7
This reverts commit e6c253e363dee77ef7e5c5f44c4ca55cded3fd47.
803fb7
803fb7
rhel-only
803fb7
Resolves: #1263158
803fb7
---
803fb7
 NEWS                     | 12 ------------
803fb7
 sysctl.d/50-default.conf |  3 ---
803fb7
 2 files changed, 15 deletions(-)
803fb7
803fb7
diff --git a/NEWS b/NEWS
803fb7
index d78874924..ee976d44b 100644
803fb7
--- a/NEWS
803fb7
+++ b/NEWS
803fb7
@@ -619,18 +619,6 @@ CHANGES WITH 217:
803fb7
           systemd-ask-password gained a new --echo option to turn that
803fb7
           on.
803fb7
 
803fb7
-        * The default sysctl.d/ snippets will now set:
803fb7
-
803fb7
-                net.core.default_qdisc = fq_codel
803fb7
-
803fb7
-          This selects Fair Queuing Controlled Delay as the default
803fb7
-          queuing discipline for network interfaces. fq_codel helps
803fb7
-          fight the network bufferbloat problem. It is believed to be
803fb7
-          a good default with no tuning required for most workloads.
803fb7
-          Downstream distributions may override this choice. On 10Gbit
803fb7
-          servers that do not do forwarding, "fq" may perform better.
803fb7
-          Systems without a good clocksource should use "pfifo_fast".
803fb7
-
803fb7
         * If kdbus is enabled during build a new option BusPolicy= is
803fb7
           available for service units, that allows locking all service
803fb7
           processes into a stricter bus policy, in order to limit
803fb7
diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
803fb7
index def151bb8..44c48236c 100644
803fb7
--- a/sysctl.d/50-default.conf
803fb7
+++ b/sysctl.d/50-default.conf
803fb7
@@ -32,9 +32,6 @@ net.ipv4.conf.all.accept_source_route = 0
803fb7
 net.ipv4.conf.default.promote_secondaries = 1
803fb7
 net.ipv4.conf.all.promote_secondaries = 1
803fb7
 
803fb7
-# Fair Queue CoDel packet scheduler to fight bufferbloat
803fb7
-net.core.default_qdisc = fq_codel
803fb7
-
803fb7
 # Enable hard and soft link protection
803fb7
 fs.protected_hardlinks = 1
803fb7
 fs.protected_symlinks = 1