]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ipvs: remove dependency on ip6_tables
authorYaroslav Bolyukin <iam@lach.pw>
Sat, 29 Aug 2020 13:59:53 +0000 (18:59 +0500)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 31 Aug 2020 21:06:51 +0000 (23:06 +0200)
This dependency was added because ipv6_find_hdr was in iptables specific
code but is no longer required

Fixes: f8f626754ebe ("ipv6: Move ipv6_find_hdr() out of Netfilter code.")
Fixes: 63dca2c0b0e7 ("ipvs: Fix faulty IPv6 extension header handling in IPVS")
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/net/ip_vs.h
net/netfilter/ipvs/Kconfig

index 9a59a33787cb8445c5846a5e0555f2bee1e12cc8..d609e957a3ec0180d11f3f8bd097d643a69796c3 100644 (file)
@@ -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
index 2c1593089eded9984b96ea778e3f88a3816f50da..eb0e329f9b8d6974256f7a549c84ab78223394a0 100644 (file)
@@ -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.