UPSTREAM: selftests/tc-testing: Remove configs that no longer exist

Some qdiscs and classifiers have recently been retired from kernel.
However, tc-testing config is still cluttered with them which causes noise
when using merge_config.sh script to update existing config for tc-testing
compatibility. Remove the config settings for affected qdiscs and
classifiers.

Bug: 254441685
Fixes: fb38306ceb ("net/sched: Retire ATM qdisc")
Fixes: 051d442098 ("net/sched: Retire CBQ qdisc")
Fixes: bbe77c14ee ("net/sched: Retire dsmark qdisc")
Fixes: 265b4da82d ("net/sched: Retire rsvp classifier")
Fixes: 8c710f7525 ("net/sched: Retire tcindex classifier")
Signed-off-by: Vlad Buslov <vladbu@nvidia.com>
Reviewed-by: Pedro Tammela <pctammela@mojatatu.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 11b8b2e70a)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Ifd5de69f462686075f43c7c98937eb7999a4bd17
This commit is contained in:
Vlad Buslov
2023-06-12 09:57:12 +02:00
committed by Lee Jones
parent 7c793b4d8f
commit e5f37a2c46

View File

@@ -12,14 +12,11 @@ CONFIG_NET_SCHED=y
# #
# Queueing/Scheduling # Queueing/Scheduling
# #
CONFIG_NET_SCH_ATM=m
CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CBS=m
CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_DRR=m
CONFIG_NET_SCH_DSMARK=m
CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETF=m
CONFIG_NET_SCH_FQ=m CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_FQ_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m
@@ -57,8 +54,6 @@ CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_FLOWER=m CONFIG_NET_CLS_FLOWER=m
CONFIG_NET_CLS_MATCHALL=m CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m CONFIG_NET_EMATCH_CMP=m