Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 493685f3 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by Greg Kroah-Hartman
Browse files

net/sched: Retire CBQ qdisc 



commit 051d442098421c28c7951625652f61b1e15c4bd5 upstream.

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: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Acked-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d17e735

net/sched/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -45,23 +45,6 @@ if NET_SCHED 


comment "Queueing/Scheduling"



config NET_SCH_CBQ

	tristate "Class Based Queueing (CBQ)"

	---help---

	  Say Y here if you want to use the Class-Based Queueing (CBQ) packet

	  scheduling algorithm. This algorithm classifies the waiting packets

	  into a tree-like hierarchy of classes; the leaves of this tree are

	  in turn scheduled by separate algorithms.



	  See the top of <file:net/sched/sch_cbq.c> for more details.



	  CBQ is a commonly used scheduler, so if you're unsure, you should

	  say Y here. Then say Y to all the queueing algorithms below that you

	  want to use as leaf disciplines.



	  To compile this code as a module, choose M here: the

	  module will be called sch_cbq.



config NET_SCH_HTB

	tristate "Hierarchical Token Bucket (HTB)"

	---help---

net/sched/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ obj-$(CONFIG_NET_IFE_SKBTCINDEX) += act_meta_skbtcindex.o 
obj-$(CONFIG_NET_ACT_TUNNEL_KEY)+= act_tunnel_key.o

obj-$(CONFIG_NET_ACT_CT)	+= act_ct.o

obj-$(CONFIG_NET_SCH_FIFO)	+= sch_fifo.o

obj-$(CONFIG_NET_SCH_CBQ)	+= sch_cbq.o

obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o

obj-$(CONFIG_NET_SCH_HFSC)	+= sch_hfsc.o

obj-$(CONFIG_NET_SCH_RED)	+= sch_red.o

net/sched/sch_cbq.c

deleted100644 → 0
+0 −1818

File deleted.

Preview size limit exceeded, changes collapsed.