Skip to content

Commit 051d442

Browse files
jhsmtPaolo Abeni
authored andcommitted
net/sched: Retire CBQ qdisc
While this amazing qdisc has served us well over the years it has not been getting any tender love and care and has bitrotted over time. It has become mostly a shooting target for syzkaller lately. For this reason, we are retiring it. Goodbye CBQ - we loved you. Signed-off-by: Jamal Hadi Salim <[email protected]> Acked-by: Jiri Pirko <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent 8fdf665 commit 051d442

File tree

4 files changed

+0
-1929
lines changed

4 files changed

+0
-1929
lines changed

net/sched/Kconfig

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,6 @@ if NET_SCHED
4545

4646
comment "Queueing/Scheduling"
4747

48-
config NET_SCH_CBQ
49-
tristate "Class Based Queueing (CBQ)"
50-
help
51-
Say Y here if you want to use the Class-Based Queueing (CBQ) packet
52-
scheduling algorithm. This algorithm classifies the waiting packets
53-
into a tree-like hierarchy of classes; the leaves of this tree are
54-
in turn scheduled by separate algorithms.
55-
56-
See the top of <file:net/sched/sch_cbq.c> for more details.
57-
58-
CBQ is a commonly used scheduler, so if you're unsure, you should
59-
say Y here. Then say Y to all the queueing algorithms below that you
60-
want to use as leaf disciplines.
61-
62-
To compile this code as a module, choose M here: the
63-
module will be called sch_cbq.
64-
6548
config NET_SCH_HTB
6649
tristate "Hierarchical Token Bucket (HTB)"
6750
help

net/sched/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ obj-$(CONFIG_NET_ACT_TUNNEL_KEY)+= act_tunnel_key.o
3333
obj-$(CONFIG_NET_ACT_CT) += act_ct.o
3434
obj-$(CONFIG_NET_ACT_GATE) += act_gate.o
3535
obj-$(CONFIG_NET_SCH_FIFO) += sch_fifo.o
36-
obj-$(CONFIG_NET_SCH_CBQ) += sch_cbq.o
3736
obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o
3837
obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o
3938
obj-$(CONFIG_NET_SCH_RED) += sch_red.o

0 commit comments

Comments
 (0)