aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-01 12:29:29 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-01 12:29:29 +0000
commit27f7e08c472d9a698272d7d2d6af43bcf47b3dbf (patch)
treea215494cb1b345ba657af269e800376d8d442c8d /package/kernel/linux
parent3f14d77412a96369ac790cb4626297d4c5335dd4 (diff)
downloadupstream-27f7e08c472d9a698272d7d2d6af43bcf47b3dbf.tar.gz
upstream-27f7e08c472d9a698272d7d2d6af43bcf47b3dbf.tar.bz2
upstream-27f7e08c472d9a698272d7d2d6af43bcf47b3dbf.zip
kernel: fix duplication of sch_netem in multiple packages (#21479)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r48018 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48023 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/linux')
-rw-r--r--package/kernel/linux/modules/netsupport.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index adfdace360..b1899da5f9 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -730,7 +730,7 @@ $(eval $(call KernelPackage,mppe))
SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko))
SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit
-SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark sch_esfq
+SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark sch_esfq sch_netem
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))