aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-05-18 18:36:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-05-18 18:36:36 +0000
commit040ce45f98b238217d1cd27e48ea7d0a022655a3 (patch)
treef6458b797f35cdf0ced32589b4710fe3dc25ee38
parentc63ef048747629cde1be29cb9eda4b2c5b10ee93 (diff)
downloadupstream-040ce45f98b238217d1cd27e48ea7d0a022655a3.tar.gz
upstream-040ce45f98b238217d1cd27e48ea7d0a022655a3.tar.bz2
upstream-040ce45f98b238217d1cd27e48ea7d0a022655a3.zip
kernel: split off act_connmark into a separate package to avoid cluttering kmod-sched with a netfilter dependency (fixes #11483)
SVN-Revision: 31791
-rw-r--r--package/kernel/modules/netsupport.mk15
-rw-r--r--package/qos-scripts/Makefile2
2 files changed, 12 insertions, 5 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index f122b68d31..78c209b8e9 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 \
diff --git a/package/qos-scripts/Makefile b/package/qos-scripts/Makefile
index 83821288d9..be2a5a8ed1 100644
--- a/package/qos-scripts/Makefile
+++ b/package/qos-scripts/Makefile
@@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/qos-scripts
SECTION:=utils
CATEGORY:=Base system
- DEPENDS:=+tc +kmod-sched-core +kmod-ifb +iptables +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra
+ DEPENDS:=+tc +kmod-sched-core +kmod-sched-connmark +kmod-ifb +iptables +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra
TITLE:=QoS scripts
PKGARCH:=all
endef