mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

kernel: move esfq to kmod-sched-esfq, as it has extra netfilter dependencies

Browse Source 
SVN-Revision: 32001
This commit is contained in:
Felix Fietkau 2012-05-29 22:22:19 +00:00
parent 9e02593b70
commit ce4aa59497
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/kernel/modules/netsupport.mk
View File

@ -595,7 +595,8 @@ $(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_codel sch_fq_codel sch_hfsc cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit
SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_CORE) act_connmark,$(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))) 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_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA))
@ -638,6 +639,17 @@ define KernelPackage/sched-connmark
endef endef
$(eval $(call KernelPackage,sched-connmark)) $(eval $(call KernelPackage,sched-connmark))
define KernelPackage/sched-esfq
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Traffic shaper ESFQ support
DEPENDS:=+kmod-sched-core +kmod-ipt-core
KCONFIG:= \
CONFIG_NET_SCH_ESFQ \
CONFIG_NET_SCH_ESFQ_NFCT=y
FILES:=$(LINUX_DIR)/net/sched/sch_esfq.ko
endef
$(eval $(call KernelPackage,sched-esfq))
define KernelPackage/sched define KernelPackage/sched
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Extra traffic schedulers TITLE:=Extra traffic schedulers
@ -645,8 +657,6 @@ define KernelPackage/sched
KCONFIG:= \ KCONFIG:= \
CONFIG_NET_SCH_DSMARK \ CONFIG_NET_SCH_DSMARK \
CONFIG_NET_SCH_HTB \ CONFIG_NET_SCH_HTB \
CONFIG_NET_SCH_ESFQ \
CONFIG_NET_SCH_ESFQ_NFCT=y \
CONFIG_NET_SCH_FIFO \ CONFIG_NET_SCH_FIFO \
CONFIG_NET_SCH_GRED \ CONFIG_NET_SCH_GRED \
CONFIG_NET_SCH_PRIO \ CONFIG_NET_SCH_PRIO \