kernel: move codel from kmod-sched-core to kmod-sched, it is rarely needed

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37256

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index ff1f7947018666570557bfc03f8391bd932e1283..5b31093b3375c2ff6a119c708ea8d68b669dd6b6 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -642,7 +642,7 @@ $(eval $(call KernelPackage,mppe))
 
 
 SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko))
 
 
 SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko))

-SCHED_MODULES_CORE = sch_ingress sch_codel sch_fq_codel sch_hfsc cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit
+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_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES))
 SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES)))
 SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark sch_esfq
 SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES))
 SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES)))


@@ -655,7 +655,6 @@ define KernelPackage/sched-core
        CONFIG_NET_SCHED=y \
        CONFIG_NET_SCH_HFSC \
        CONFIG_NET_SCH_INGRESS \
        CONFIG_NET_SCHED=y \
        CONFIG_NET_SCH_HFSC \
        CONFIG_NET_SCH_INGRESS \

-       CONFIG_NET_SCH_CODEL \

        CONFIG_NET_SCH_FQ_CODEL \
        CONFIG_NET_CLS=y \
        CONFIG_NET_CLS_ACT=y \
        CONFIG_NET_SCH_FQ_CODEL \
        CONFIG_NET_CLS=y \
        CONFIG_NET_CLS_ACT=y \


@@ -706,6 +705,7 @@ define KernelPackage/sched
   TITLE:=Extra traffic schedulers
   DEPENDS:=+kmod-sched-core
   KCONFIG:= \
   TITLE:=Extra traffic schedulers
   DEPENDS:=+kmod-sched-core
   KCONFIG:= \

+       CONFIG_NET_SCH_CODEL \

        CONFIG_NET_SCH_DSMARK \
        CONFIG_NET_SCH_HTB \
        CONFIG_NET_SCH_FIFO \
        CONFIG_NET_SCH_DSMARK \
        CONFIG_NET_SCH_HTB \
        CONFIG_NET_SCH_FIFO \