mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2025-11-22 21:20:14 +00:00
11b8b2e70a
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: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>
104 lines
2.0 KiB
Plaintext
104 lines
2.0 KiB
Plaintext
#
|
|
# Core Netfilter Configuration
|
|
#
|
|
CONFIG_NF_CONNTRACK=m
|
|
CONFIG_NF_CONNTRACK_MARK=y
|
|
CONFIG_NF_CONNTRACK_ZONES=y
|
|
CONFIG_NF_CONNTRACK_LABELS=y
|
|
CONFIG_NF_NAT=m
|
|
CONFIG_NETFILTER_XT_TARGET_LOG=m
|
|
|
|
CONFIG_NET_SCHED=y
|
|
|
|
#
|
|
# Queueing/Scheduling
|
|
#
|
|
CONFIG_NET_SCH_CAKE=m
|
|
CONFIG_NET_SCH_CBS=m
|
|
CONFIG_NET_SCH_CHOKE=m
|
|
CONFIG_NET_SCH_CODEL=m
|
|
CONFIG_NET_SCH_DRR=m
|
|
CONFIG_NET_SCH_ETF=m
|
|
CONFIG_NET_SCH_FQ=m
|
|
CONFIG_NET_SCH_FQ_CODEL=m
|
|
CONFIG_NET_SCH_GRED=m
|
|
CONFIG_NET_SCH_HFSC=m
|
|
CONFIG_NET_SCH_HHF=m
|
|
CONFIG_NET_SCH_HTB=m
|
|
CONFIG_NET_SCH_INGRESS=m
|
|
CONFIG_NET_SCH_MQPRIO=m
|
|
CONFIG_NET_SCH_MULTIQ=m
|
|
CONFIG_NET_SCH_NETEM=m
|
|
CONFIG_NET_SCH_PIE=m
|
|
CONFIG_NET_SCH_PLUG=m
|
|
CONFIG_NET_SCH_PRIO=m
|
|
CONFIG_NET_SCH_QFQ=m
|
|
CONFIG_NET_SCH_SFB=m
|
|
CONFIG_NET_SCH_SFQ=m
|
|
CONFIG_NET_SCH_SKBPRIO=m
|
|
CONFIG_NET_SCH_TAPRIO=m
|
|
CONFIG_NET_SCH_TBF=m
|
|
CONFIG_NET_SCH_TEQL=m
|
|
|
|
#
|
|
# Classification
|
|
#
|
|
CONFIG_NET_CLS=y
|
|
CONFIG_NET_CLS_FW=m
|
|
CONFIG_NET_CLS_U32=m
|
|
CONFIG_CLS_U32_PERF=y
|
|
CONFIG_CLS_U32_MARK=y
|
|
CONFIG_NET_CLS_BASIC=m
|
|
CONFIG_NET_CLS_BPF=m
|
|
CONFIG_NET_CLS_CGROUP=m
|
|
CONFIG_NET_CLS_FLOW=m
|
|
CONFIG_NET_CLS_FLOWER=m
|
|
CONFIG_NET_CLS_MATCHALL=m
|
|
CONFIG_NET_CLS_ROUTE4=m
|
|
CONFIG_NET_EMATCH=y
|
|
CONFIG_NET_EMATCH_STACK=32
|
|
CONFIG_NET_EMATCH_CMP=m
|
|
CONFIG_NET_EMATCH_NBYTE=m
|
|
CONFIG_NET_EMATCH_U32=m
|
|
CONFIG_NET_EMATCH_META=m
|
|
CONFIG_NET_EMATCH_TEXT=m
|
|
CONFIG_NET_EMATCH_IPSET=m
|
|
CONFIG_NET_EMATCH_CANID=m
|
|
CONFIG_NET_EMATCH_IPT=m
|
|
CONFIG_NET_CLS_ACT=y
|
|
CONFIG_NET_ACT_POLICE=m
|
|
CONFIG_NET_ACT_GACT=m
|
|
CONFIG_GACT_PROB=y
|
|
CONFIG_NET_ACT_MIRRED=m
|
|
CONFIG_NET_ACT_SAMPLE=m
|
|
CONFIG_NET_ACT_IPT=m
|
|
CONFIG_NET_ACT_NAT=m
|
|
CONFIG_NET_ACT_PEDIT=m
|
|
CONFIG_NET_ACT_SIMP=m
|
|
CONFIG_NET_ACT_SKBEDIT=m
|
|
CONFIG_NET_ACT_CSUM=m
|
|
CONFIG_NET_ACT_VLAN=m
|
|
CONFIG_NET_ACT_BPF=m
|
|
CONFIG_NET_ACT_CONNMARK=m
|
|
CONFIG_NET_ACT_CTINFO=m
|
|
CONFIG_NET_ACT_SKBMOD=m
|
|
CONFIG_NET_ACT_IFE=m
|
|
CONFIG_NET_ACT_TUNNEL_KEY=m
|
|
CONFIG_NET_ACT_CT=m
|
|
CONFIG_NET_ACT_MPLS=m
|
|
CONFIG_NET_ACT_GATE=m
|
|
CONFIG_NET_IFE_SKBMARK=m
|
|
CONFIG_NET_IFE_SKBPRIO=m
|
|
CONFIG_NET_IFE_SKBTCINDEX=m
|
|
CONFIG_NET_SCH_FIFO=y
|
|
CONFIG_NET_SCH_ETS=m
|
|
CONFIG_NET_SCH_RED=m
|
|
CONFIG_NET_SCH_FQ_PIE=m
|
|
CONFIG_NETDEVSIM=m
|
|
|
|
#
|
|
## Network testing
|
|
#
|
|
CONFIG_CAN=m
|
|
CONFIG_ATM=y
|