aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorThomas Langer <tlanger@maxlinear.com>2022-07-29 18:35:57 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-08-14 00:01:48 +0200
commitfc05102d510bcdaabdb5d3064db46cda95aed5ed (patch)
treede3054a8c2a984f2555bdd05917e1109e1b5b73d /package
parent3b51f74a9110531ff73a2d5eb9ff6fb13c255459 (diff)
downloadupstream-fc05102d510bcdaabdb5d3064db46cda95aed5ed.tar.gz
upstream-fc05102d510bcdaabdb5d3064db46cda95aed5ed.tar.bz2
upstream-fc05102d510bcdaabdb5d3064db46cda95aed5ed.zip
kernel: netsupport: kmod-sched: explicitly define included modules
Change SCHED_MODULES_EXTRA to an explicit list of modules instead of taking everything that is not filtered out. This removes the need of updating the filter each time an extra sch_*, act_* or similar is added with an own kmod definition. Signed-off-by: Thomas Langer <tlanger@maxlinear.com> Signed-off-by: Hauke Mehrtens <hmehrtens@maxlinear.com> (cherry picked from commit 1b956e66ccafc962033260567c2f1e845f71683f)
Diffstat (limited to 'package')
-rw-r--r--package/kernel/linux/modules/netsupport.mk11
1 files changed, 5 insertions, 6 deletions
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 121da205f6..438566b8c0 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -738,12 +738,8 @@ endef
$(eval $(call KernelPackage,mppe))
-SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko))
SCHED_MODULES_CORE = sch_ingress sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_gact act_mirred act_skbedit cls_matchall
-SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark act_ctinfo sch_cake sch_netem sch_mqprio em_ipset cls_bpf cls_flower act_bpf act_vlan
-SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES))
-SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES)))
-SCHED_FILES_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA))
+SCHED_FILES_CORE = $(foreach mod,$(SCHED_MODULES_CORE),$(LINUX_DIR)/net/sched/$(mod).ko)
define KernelPackage/sched-core
SUBMENU:=$(NETWORK_SUPPORT_MENU)
@@ -768,7 +764,7 @@ define KernelPackage/sched-core
CONFIG_NET_CLS_MATCHALL \
CONFIG_NET_EMATCH=y \
CONFIG_NET_EMATCH_U32
- FILES:=$(SCHED_FILES)
+ FILES:=$(SCHED_FILES_CORE)
AUTOLOAD:=$(call AutoLoad,70, $(SCHED_MODULES_CORE))
endef
@@ -900,6 +896,9 @@ endef
$(eval $(call KernelPackage,bpf-test))
+SCHED_MODULES_EXTRA = sch_codel sch_dsmark sch_gred sch_multiq sch_prio sch_red sch_sfq sch_teql sch_fq sch_pie act_police act_ipt act_pedit act_simple act_csum em_cmp em_nbyte em_meta em_text
+SCHED_FILES_EXTRA = $(foreach mod,$(SCHED_MODULES_EXTRA),$(LINUX_DIR)/net/sched/$(mod).ko)
+
define KernelPackage/sched
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Extra traffic schedulers