| Message ID | 20200829135953.20228-1-iam@lach.pw |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | [PATCHv5,net-next] ipvs: remove dependency on ip6_tables | expand |
Hello, On Sat, 29 Aug 2020, Yaroslav Bolyukin wrote: > 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> Looks good to me, thanks! May be maintainers will remove the extra dot after the Fixes line. Acked-by: Julian Anastasov <ja@ssi.bg> > --- > Missed canonical patch format section, subsystem is now spevified > > 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 Regards -- Julian Anastasov <ja@ssi.bg>
On Mon, Aug 31, 2020 at 08:12:05PM +0300, Julian Anastasov wrote: > > Hello, > > On Sat, 29 Aug 2020, Yaroslav Bolyukin wrote: > > > 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> > > Looks good to me, thanks! May be maintainers will > remove the extra dot after the Fixes line. Applied, thanks. I have also removed the extra dot.
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.
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> --- Missed canonical patch format section, subsystem is now spevified include/net/ip_vs.h | 3 --- net/netfilter/ipvs/Kconfig | 1 - 2 files changed, 4 deletions(-) -- 2.28.0