Skip to content

Commit

Permalink
selftests/tc-testing: Remove configs that no longer exist
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vlad Buslov authored and Jakub Kicinski committed Jun 14, 2023
1 parent b39d8c4 commit 11b8b2e
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions tools/testing/selftests/tc-testing/config
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@ CONFIG_NET_SCHED=y
#
# Queueing/Scheduling
#
CONFIG_NET_SCH_ATM=m
CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_CBS=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_DRR=m
CONFIG_NET_SCH_DSMARK=m
CONFIG_NET_SCH_ETF=m
CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_FQ_CODEL=m
Expand Down Expand Up @@ -58,8 +55,6 @@ CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_FLOWER=m
CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m
Expand Down

0 comments on commit 11b8b2e

Please sign in to comment.