From 0093b9ddb8f95dd0585bc803db08c54c78161cfc Mon Sep 17 00:00:00 2001 From: Dust Li Date: Mon, 18 May 2020 13:11:22 +0800 Subject: [PATCH] configs/x86: align x86 NET_SCH configs to aarch64 to #27778669 Aligned NET_SCHED configs with aarch64, except: 1. CONFIG_NET_SCH_ATM is not enabled since we don't use ATM on cloud, and CONFIG_ATM is not enabled 2. CONFIG_NET_SCH_DEFAULT is not set since we still use pfifo_fast as the default scheduler. 3. CONFIG_NET_SCH_FQ_CODEL set to 'm' since we don't use fq_codel as the default qdisc Signed-off-by: Dust Li Reviewed-by: Shile Zhang Acked-by: Joseph Qi --- configs/config-4.19.y-x86_64 | 38 +++++++++++++++--------------- configs/config-4.19.y-x86_64-debug | 38 +++++++++++++++--------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/configs/config-4.19.y-x86_64 b/configs/config-4.19.y-x86_64 index 078fc909bcc1..2c6e6b782372 100644 --- a/configs/config-4.19.y-x86_64 +++ b/configs/config-4.19.y-x86_64 @@ -1471,34 +1471,34 @@ CONFIG_NET_SCHED=y # # Queueing/Scheduling # -CONFIG_NET_SCH_CBQ=y +CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m -# CONFIG_NET_SCH_PRIO is not set -CONFIG_NET_SCH_MULTIQ=y -# CONFIG_NET_SCH_RED is not set -# CONFIG_NET_SCH_SFB is not set +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m CONFIG_NET_SCH_SFQ=m -# CONFIG_NET_SCH_TEQL is not set -# CONFIG_NET_SCH_TBF is not set +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_CBS is not set # CONFIG_NET_SCH_ETF is not set -# CONFIG_NET_SCH_GRED is not set -# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m -# CONFIG_NET_SCH_DRR is not set -# CONFIG_NET_SCH_MQPRIO is not set +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m # CONFIG_NET_SCH_SKBPRIO is not set -# CONFIG_NET_SCH_CHOKE is not set -# CONFIG_NET_SCH_QFQ is not set -# CONFIG_NET_SCH_CODEL is not set -CONFIG_NET_SCH_FQ_CODEL=y +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m # CONFIG_NET_SCH_CAKE is not set -CONFIG_NET_SCH_FQ=y -# CONFIG_NET_SCH_HHF is not set -# CONFIG_NET_SCH_PIE is not set +CONFIG_NET_SCH_FQ=m +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m -# CONFIG_NET_SCH_PLUG is not set +CONFIG_NET_SCH_PLUG=m # CONFIG_NET_SCH_DEFAULT is not set # diff --git a/configs/config-4.19.y-x86_64-debug b/configs/config-4.19.y-x86_64-debug index 32c10cb649e7..378c3bfad1cc 100644 --- a/configs/config-4.19.y-x86_64-debug +++ b/configs/config-4.19.y-x86_64-debug @@ -1471,34 +1471,34 @@ CONFIG_NET_SCHED=y # # Queueing/Scheduling # -CONFIG_NET_SCH_CBQ=y +CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m -# CONFIG_NET_SCH_PRIO is not set -CONFIG_NET_SCH_MULTIQ=y -# CONFIG_NET_SCH_RED is not set -# CONFIG_NET_SCH_SFB is not set +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m CONFIG_NET_SCH_SFQ=m -# CONFIG_NET_SCH_TEQL is not set -# CONFIG_NET_SCH_TBF is not set +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_CBS is not set # CONFIG_NET_SCH_ETF is not set -# CONFIG_NET_SCH_GRED is not set -# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m -# CONFIG_NET_SCH_DRR is not set -# CONFIG_NET_SCH_MQPRIO is not set +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m # CONFIG_NET_SCH_SKBPRIO is not set -# CONFIG_NET_SCH_CHOKE is not set -# CONFIG_NET_SCH_QFQ is not set -# CONFIG_NET_SCH_CODEL is not set -CONFIG_NET_SCH_FQ_CODEL=y +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m # CONFIG_NET_SCH_CAKE is not set -CONFIG_NET_SCH_FQ=y -# CONFIG_NET_SCH_HHF is not set -# CONFIG_NET_SCH_PIE is not set +CONFIG_NET_SCH_FQ=m +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m -# CONFIG_NET_SCH_PLUG is not set +CONFIG_NET_SCH_PLUG=m # CONFIG_NET_SCH_DEFAULT is not set # -- GitLab