From: Jo-Philipp Wich <jo@mein.io>
Date: Sun, 14 Jan 2018 19:06:07 +0000 (+0100)
Subject: netfilter: enable CONFIG_NF_CONNTRACK_MARK from kmod-nf-conntrack
X-Git-Tag: v19.07.0-rc1~4802
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5c0b28881567163f698ebbcbdcac5eb88fccc9bf;p=openwrt%2Fstaging%2Fhauke.git

netfilter: enable CONFIG_NF_CONNTRACK_MARK from kmod-nf-conntrack

Unconditionally enable connmark support and tie it to the conntrack core
module to allow removing this kernel configuration dependency from the
xtables-addons package.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 0d817ed7f4..f458457500 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -68,6 +68,7 @@ define KernelPackage/nf-conntrack
   KCONFIG:= \
         CONFIG_NETFILTER=y \
         CONFIG_NETFILTER_ADVANCED=y \
+        CONFIG_NF_CONNTRACK_MARK=y \
         CONFIG_NF_CONNTRACK_ZONES=y \
 	$(KCONFIG_NF_CONNTRACK)
   FILES:=$(foreach mod,$(NF_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).ko)