Skip to content

Commit

Permalink
kernel: generic: select the fq_codel qdisc by default
Browse files Browse the repository at this point in the history
The kernel configuration allows us to select a default qdisc. Let's do this for
5.10 (as 5.4 is on its way out) and get rid of the hacky patch we've been
carrying.

Acked-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
  • Loading branch information
rsalvaterra committed Feb 9, 2022
1 parent 1847382 commit f39872d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 101 deletions.
5 changes: 4 additions & 1 deletion target/linux/generic/config-5.10
Expand Up @@ -1331,11 +1331,14 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DECNET is not set
CONFIG_DEFAULT_CUBIC=y
CONFIG_DEFAULT_DEADLINE=y
CONFIG_DEFAULT_FQ_CODEL=y
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_INIT=""
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_DEFAULT_NET_SCH="fq_codel"
# CONFIG_DEFAULT_NOOP is not set
# CONFIG_DEFAULT_PFIFO_FAST is not set
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_SECURITY=""
CONFIG_DEFAULT_SECURITY_DAC=y
Expand Down Expand Up @@ -3910,7 +3913,7 @@ CONFIG_NET_SCHED=y
# CONFIG_NET_SCH_CBS is not set
# CONFIG_NET_SCH_CHOKE is not set
# CONFIG_NET_SCH_CODEL is not set
# CONFIG_NET_SCH_DEFAULT is not set
CONFIG_NET_SCH_DEFAULT=y
# CONFIG_NET_SCH_DRR is not set
# CONFIG_NET_SCH_DSMARK is not set
# CONFIG_NET_SCH_ETF is not set
Expand Down
100 changes: 0 additions & 100 deletions target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch

This file was deleted.

0 comments on commit f39872d

Please sign in to comment.