LVS
lvs-devel
Google
 
Web LinuxVirtualServer.org

[PATCH] Remove ipvs v6 dependency on iptables

To: ja@xxxxxx, Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
Subject: [PATCH] Remove ipvs v6 dependency on iptables
Cc: iam@xxxxxxx, Wensong Zhang <wensong@xxxxxxxxxxxx>, Simon Horman <horms@xxxxxxxxxxxx>, "David S. Miller" <davem@xxxxxxxxxxxxx>, Alexey Kuznetsov <kuznet@xxxxxxxxxxxxx>, Hideaki YOSHIFUJI <yoshfuji@xxxxxxxxxxxxxx>, Jakub Kicinski <kuba@xxxxxxxxxx>, Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>, Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx>, Florian Westphal <fw@xxxxxxxxx>, netdev@xxxxxxxxxxxxxxx, lvs-devel@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, netfilter-devel@xxxxxxxxxxxxxxx, coreteam@xxxxxxxxxxxxx
From: Yaroslav Bolyukin <iam@xxxxxxx>
Date: Sat, 29 Aug 2020 13:50:05 +0500
This dependency was added as part of commit ecefa32ffda201975
("ipvs: Fix faulty IPv6 extension header handling in IPVS"), because it
had dependency on ipv6_find_hdr, which was located in iptables-specific
code

But it is no longer required after commit e6f890cfde0e74d5b
("ipv6:Move ipv6_find_hdr() out of Netfilter code.")

Also remove ip6tables include from ip_vs

Signed-off-by: Yaroslav Bolyukin <iam@xxxxxxx>
---
 include/net/ip_vs.h        | 3 ---
 net/netfilter/ipvs/Kconfig | 1 -
 2 files changed, 4 deletions(-)

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 9a59a3378..d609e957a 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -25,9 +25,6 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>                        /* for struct ipv6hdr */
 #include <net/ipv6.h>
-#if IS_ENABLED(CONFIG_IP_VS_IPV6)
-#include <linux/netfilter_ipv6/ip6_tables.h>
-#endif
 #if IS_ENABLED(CONFIG_NF_CONNTRACK)
 #include <net/netfilter/nf_conntrack.h>
 #endif
diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig
index 2c1593089..eb0e329f9 100644
--- a/net/netfilter/ipvs/Kconfig
+++ b/net/netfilter/ipvs/Kconfig
@@ -29,7 +29,6 @@ if IP_VS
 config IP_VS_IPV6
        bool "IPv6 support for IPVS"
        depends on IPV6 = y || IP_VS = IPV6
-       select IP6_NF_IPTABLES
        select NF_DEFRAG_IPV6
        help
          Add IPv6 support to IPVS.
-- 
2.28.0


<Prev in Thread] Current Thread [Next in Thread>