diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-29 22:22:19 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-29 22:22:19 +0000 |
| commit | 80f0c401c284347a24cb5695a1346257480e1190 (patch) | |
| tree | 2a8b310558238b208180fd8a9e4bbaf26cf8bd8d | |
| parent | 7cab23d0dcd7f717b6aca8da3d11e7c661b717ef (diff) | |
kernel: move esfq to kmod-sched-esfq, as it has extra netfilter dependencies
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32001 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/kernel/modules/netsupport.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 0b4b16efbb..81c21245c2 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -595,7 +595,8 @@ $(eval $(call KernelPackage,mppe)) 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_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_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA)) @@ -638,6 +639,17 @@ define KernelPackage/sched-connmark endef $(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 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Extra traffic schedulers @@ -645,8 +657,6 @@ define KernelPackage/sched KCONFIG:= \ CONFIG_NET_SCH_DSMARK \ CONFIG_NET_SCH_HTB \ - CONFIG_NET_SCH_ESFQ \ - CONFIG_NET_SCH_ESFQ_NFCT=y \ CONFIG_NET_SCH_FIFO \ CONFIG_NET_SCH_GRED \ CONFIG_NET_SCH_PRIO \ |