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