From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 26 Feb 2018 09:15:16 +0000 (+0100)
Subject: netfilter: nf_flow_table: relax mixed ipv4/ipv6 flowtable dependencies
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1e80380b14681f229fc6bcd3d53f001f4fc0a463;p=openwrt%2Fstaging%2Fblogic.git

netfilter: nf_flow_table: relax mixed ipv4/ipv6 flowtable dependencies

Since the offload hook code was moved, this table no longer depends on
the IPv4 and IPv6 flowtable modules

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 704b3832dbad..d20664b02ae4 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -666,8 +666,7 @@ endif # NF_TABLES
 
 config NF_FLOW_TABLE_INET
 	tristate "Netfilter flow table mixed IPv4/IPv6 module"
-	depends on NF_FLOW_TABLE_IPV4
-	depends on NF_FLOW_TABLE_IPV6
+	depends on NF_FLOW_TABLE
 	help
           This option adds the flow table mixed IPv4/IPv6 support.