aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-01 12:26:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-01 12:26:09 +0000
commit7509c940e9d0b17e23d094222e27ba1247d4a980 (patch)
tree72f4772c4f406a709f3a7439bc182d98358a3050 /package
parent98f27a223da5d6bdf79faea1c901f54d7d0a3897 (diff)
downloadupstream-7509c940e9d0b17e23d094222e27ba1247d4a980.tar.gz
upstream-7509c940e9d0b17e23d094222e27ba1247d4a980.tar.bz2
upstream-7509c940e9d0b17e23d094222e27ba1247d4a980.zip
kernel: fix duplication of sch_netem in multiple packages (#21479)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48018
Diffstat (limited to 'package')
-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 66c6617d99..2fa87b99d0 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -732,7 +732,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))