Skip to content

Commit 11b8b2e

Browse files
w1ldptrkuba-moo
authored andcommitted
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: fb38306 ("net/sched: Retire ATM qdisc") Fixes: 051d442 ("net/sched: Retire CBQ qdisc") Fixes: bbe77c1 ("net/sched: Retire dsmark qdisc") Fixes: 265b4da ("net/sched: Retire rsvp classifier") Fixes: 8c710f7 ("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>
1 parent b39d8c4 commit 11b8b2e

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

  • tools/testing/selftests/tc-testing

tools/testing/selftests/tc-testing/config

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@ CONFIG_NET_SCHED=y
1313
#
1414
# Queueing/Scheduling
1515
#
16-
CONFIG_NET_SCH_ATM=m
1716
CONFIG_NET_SCH_CAKE=m
18-
CONFIG_NET_SCH_CBQ=m
1917
CONFIG_NET_SCH_CBS=m
2018
CONFIG_NET_SCH_CHOKE=m
2119
CONFIG_NET_SCH_CODEL=m
2220
CONFIG_NET_SCH_DRR=m
23-
CONFIG_NET_SCH_DSMARK=m
2421
CONFIG_NET_SCH_ETF=m
2522
CONFIG_NET_SCH_FQ=m
2623
CONFIG_NET_SCH_FQ_CODEL=m
@@ -58,8 +55,6 @@ CONFIG_NET_CLS_FLOW=m
5855
CONFIG_NET_CLS_FLOWER=m
5956
CONFIG_NET_CLS_MATCHALL=m
6057
CONFIG_NET_CLS_ROUTE4=m
61-
CONFIG_NET_CLS_RSVP=m
62-
CONFIG_NET_CLS_TCINDEX=m
6358
CONFIG_NET_EMATCH=y
6459
CONFIG_NET_EMATCH_STACK=32
6560
CONFIG_NET_EMATCH_CMP=m

0 commit comments

Comments
 (0)