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