Commit 11b8b2e7 authored by Vlad Buslov's avatar Vlad Buslov Committed by Jakub Kicinski

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.

Fixes: fb38306c ("net/sched: Retire ATM qdisc")
Fixes: 051d4420 ("net/sched: Retire CBQ qdisc")
Fixes: bbe77c14 ("net/sched: Retire dsmark qdisc")
Fixes: 265b4da8 ("net/sched: Retire rsvp classifier")
Fixes: 8c710f75 ("net/sched: Retire tcindex classifier")
Signed-off-by: default avatarVlad Buslov <vladbu@nvidia.com>
Reviewed-by: default avatarPedro Tammela <pctammela@mojatatu.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b39d8c41
...@@ -13,14 +13,11 @@ CONFIG_NET_SCHED=y ...@@ -13,14 +13,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
...@@ -58,8 +55,6 @@ CONFIG_NET_CLS_FLOW=m ...@@ -58,8 +55,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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment