| Message ID | 20200829085005.24931-1-iam@lach.pw |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | Remove ipvs v6 dependency on iptables | expand |
Hello, On Sat, 29 Aug 2020, Yaroslav Bolyukin wrote: > 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@lach.pw> The commit you reference better to be added as special tag, eg: Fixes: f8f626754ebe ("ipv6: Move ipv6_find_hdr() out of Netfilter code.") before the Signed-off-by line. Then you may skip mentioning the commit in the description, it will be in Fixes tag. Note that the first 12 chars from the commit id are used, not the last. Second Fixes line can be for 63dca2c0b0e7 ("ipvs: Fix faulty IPv6 extension header handling in IPVS"). Both Fixes lines should not be wrapped. The Subject line needs to include version and tree, for example: [PATCHv2 net-next] ipvs: remove v6 dependency on iptables You increase the version when sending modified patch. You can check the Documentation/process/submitting-patches.rst guide for more info. > --- > 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. > -- Regards -- Julian Anastasov <ja@ssi.bg>
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 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@lach.pw> --- include/net/ip_vs.h | 3 --- net/netfilter/ipvs/Kconfig | 1 - 2 files changed, 4 deletions(-)