diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-18 18:36:36 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-18 18:36:36 +0000 |
| commit | 435a2cf2ad4fd3fce709defc50f14564a61781ae (patch) | |
| tree | 5a5d0e60e03bc90a0f91598c63365d51a426ba6c /package/kernel | |
| parent | 5ce0dd5cbe37650005ed38a898855688a1b41f4b (diff) | |
kernel: split off act_connmark into a separate package to avoid cluttering kmod-sched with a netfilter dependency (fixes #11483)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31791 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/modules/netsupport.mk | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index f122b68d3..78c209b8e 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -624,8 +624,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_connmark act_skbedit -SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_CORE),$(SCHED_MODULES)) +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_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_CORE)) SCHED_FILES_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA)) @@ -646,7 +646,6 @@ define KernelPackage/sched-core CONFIG_NET_CLS_TCINDEX \ CONFIG_NET_CLS_U32 \ CONFIG_NET_ACT_MIRRED \ - CONFIG_NET_ACT_CONNMARK \ CONFIG_NET_ACT_SKBEDIT \ CONFIG_NET_EMATCH=y \ CONFIG_NET_EMATCH_U32 @@ -660,9 +659,17 @@ endef $(eval $(call KernelPackage,sched-core)) +define KernelPackage/sched-connmark + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=Traffic shaper conntrack mark support + DEPENDS:=+kmod-sched-core +kmod-ipt-core +kmod-ipt-conntrack-extra + KCONFIG:=CONFIG_NET_ACT_CONNMARK +endef +$(eval $(call KernelPackage,sched-connmark)) + define KernelPackage/sched SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=Traffic schedulers + TITLE:=Extra traffic schedulers DEPENDS:=+kmod-sched-core KCONFIG:= \ CONFIG_NET_SCH_DSMARK \ |