aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/linux
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2019-06-06 10:45:15 +0100
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2019-06-06 10:45:15 +0100
commit24e09bac48b6ce90c11407676dbfa42d069cff24 (patch)
treea4564af05b348a68f8f236218ed5596aa25d84d0 /package/kernel/linux
parentf664d560df8e59f8d368273990462bba85a09668 (diff)
downloadupstream-24e09bac48b6ce90c11407676dbfa42d069cff24.tar.gz
upstream-24e09bac48b6ce90c11407676dbfa42d069cff24.tar.bz2
upstream-24e09bac48b6ce90c11407676dbfa42d069cff24.zip
Revert "kernel: backport act_ctinfo"
This reverts commit 7c50182e0cdce0366715082872a2afbcf208bbf8. Produces build error: Package kmod-sched is missing dependencies for the following libraries: nf_conntrack.ko Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/kernel/linux')
-rw-r--r--package/kernel/linux/modules/netsupport.mk10
1 files changed, 1 insertions, 9 deletions
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 7ab6d3b1b3..d92992e13f 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -803,6 +803,7 @@ endef
$(eval $(call KernelPackage,sched-mqprio))
+
define KernelPackage/sched-connmark
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Traffic shaper conntrack mark support
@@ -813,15 +814,6 @@ define KernelPackage/sched-connmark
endef
$(eval $(call KernelPackage,sched-connmark))
-define KernelPackage/sched-ctinfo
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
- TITLE:=Traffic shaper ctinfo support
- DEPENDS:=+kmod-sched-core +kmod-ipt-core +kmod-ipt-conntrack-extra
- KCONFIG:=CONFIG_NET_ACT_CTINFO
- FILES:=$(LINUX_DIR)/net/sched/act_ctinfo.ko
- AUTOLOAD:=$(call AutoLoad,71, act_ctinfo)
-endef
-$(eval $(call KernelPackage,sched-ctinfo))
define KernelPackage/sched-ipset
SUBMENU:=$(NETWORK_SUPPORT_MENU)