From: Hauke Mehrtens Date: Fri, 29 Jul 2022 16:35:58 +0000 (+0200) Subject: kernel: netsupport: kmod-sched: Reorder packages X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c94ba95e6cd41ccf8f15e77ebe7b7d65e5fd4396;p=openwrt%2Fstaging%2Fynezz.git kernel: netsupport: kmod-sched: Reorder packages This puts the kmod-sched packages into an alphabetical order. I kept the kmod-sched-core at the top as this is the main package. No changes other than reordering were done. Signed-off-by: Hauke Mehrtens --- diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index e412a909b1..4bd988ad92 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -775,37 +775,6 @@ endef $(eval $(call KernelPackage,sched-core)) -define KernelPackage/sched-cake - SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=Cake fq_codel/blue derived shaper - DEPENDS:=+kmod-sched-core - KCONFIG:=CONFIG_NET_SCH_CAKE - FILES:=$(LINUX_DIR)/net/sched/sch_cake.ko - AUTOLOAD:=$(call AutoProbe,sch_cake) -endef - -define KernelPackage/sched-cake/description - Common Applications Kept Enhanced fq_codel/blue derived shaper -endef - -$(eval $(call KernelPackage,sched-cake)) - -define KernelPackage/sched-flower - SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=Flower traffic classifier - DEPENDS:=+kmod-sched-core - KCONFIG:=CONFIG_NET_CLS_FLOWER - FILES:=$(LINUX_DIR)/net/sched/cls_flower.ko - AUTOLOAD:=$(call AutoProbe, cls_flower) -endef - -define KernelPackage/sched-flower/description - Allows to classify packets based on a configurable combination of packet keys and masks. -endef - -$(eval $(call KernelPackage,sched-flower)) - - define KernelPackage/sched-act-vlan SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Traffic VLAN manipulation @@ -822,20 +791,36 @@ endef $(eval $(call KernelPackage,sched-act-vlan)) -define KernelPackage/sched-mqprio +define KernelPackage/sched-bpf SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=Multi-queue priority scheduler (MQPRIO) + TITLE:=Traffic shaper support for Berkeley Packet Filter + KCONFIG:= \ + CONFIG_NET_CLS_BPF \ + CONFIG_NET_ACT_BPF + FILES:= \ + $(LINUX_DIR)/net/sched/cls_bpf.ko \ + $(LINUX_DIR)/net/sched/act_bpf.ko + AUTOLOAD:=$(call AutoLoad,72,cls_bpf act_bpf) +endef + +$(eval $(call KernelPackage,sched-bpf)) + + +define KernelPackage/sched-cake + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=Cake fq_codel/blue derived shaper DEPENDS:=+kmod-sched-core - KCONFIG:=CONFIG_NET_SCH_MQPRIO - FILES:=$(LINUX_DIR)/net/sched/sch_mqprio.ko - AUTOLOAD:=$(call AutoProbe, sch_mqprio) + KCONFIG:=CONFIG_NET_SCH_CAKE + FILES:=$(LINUX_DIR)/net/sched/sch_cake.ko + AUTOLOAD:=$(call AutoProbe,sch_cake) endef -define KernelPackage/sched-mqprio/description - This scheduler allows QOS to be offloaded on NICs that have support for offloading QOS schedulers. +define KernelPackage/sched-cake/description + Common Applications Kept Enhanced fq_codel/blue derived shaper endef -$(eval $(call KernelPackage,sched-mqprio)) +$(eval $(call KernelPackage,sched-cake)) + define KernelPackage/sched-connmark SUBMENU:=$(NETWORK_SUPPORT_MENU) @@ -847,6 +832,7 @@ define KernelPackage/sched-connmark endef $(eval $(call KernelPackage,sched-connmark)) + define KernelPackage/sched-ctinfo SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Traffic shaper ctinfo support @@ -857,6 +843,23 @@ define KernelPackage/sched-ctinfo endef $(eval $(call KernelPackage,sched-ctinfo)) + +define KernelPackage/sched-flower + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=Flower traffic classifier + DEPENDS:=+kmod-sched-core + KCONFIG:=CONFIG_NET_CLS_FLOWER + FILES:=$(LINUX_DIR)/net/sched/cls_flower.ko + AUTOLOAD:=$(call AutoProbe, cls_flower) +endef + +define KernelPackage/sched-flower/description + Allows to classify packets based on a configurable combination of packet keys and masks. +endef + +$(eval $(call KernelPackage,sched-flower)) + + define KernelPackage/sched-ipset SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Traffic shaper ipset support @@ -871,19 +874,20 @@ endef $(eval $(call KernelPackage,sched-ipset)) -define KernelPackage/sched-bpf +define KernelPackage/sched-mqprio SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=Traffic shaper support for Berkeley Packet Filter - KCONFIG:= \ - CONFIG_NET_CLS_BPF \ - CONFIG_NET_ACT_BPF - FILES:= \ - $(LINUX_DIR)/net/sched/cls_bpf.ko \ - $(LINUX_DIR)/net/sched/act_bpf.ko - AUTOLOAD:=$(call AutoLoad,72,cls_bpf act_bpf) + TITLE:=Multi-queue priority scheduler (MQPRIO) + DEPENDS:=+kmod-sched-core + KCONFIG:=CONFIG_NET_SCH_MQPRIO + FILES:=$(LINUX_DIR)/net/sched/sch_mqprio.ko + AUTOLOAD:=$(call AutoProbe, sch_mqprio) endef -$(eval $(call KernelPackage,sched-bpf)) +define KernelPackage/sched-mqprio/description + This scheduler allows QOS to be offloaded on NICs that have support for offloading QOS schedulers. +endef + +$(eval $(call KernelPackage,sched-mqprio)) define KernelPackage/bpf-test