Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] Remove ipvs v6 dependency on iptables
@ 2020-08-27 19:48 Lach
2020-08-27 20:59 ` Julian Anastasov
0 siblings, 1 reply; 10+ messages in thread
From: Lach @ 2020-08-27 19:48 UTC (permalink / raw)
Cc: iam, Wensong Zhang, Simon Horman, Julian Anastasov,
Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal,
David S. Miller, Jakub Kicinski, netdev, lvs-devel,
netfilter-devel, coreteam, linux-kernel
This dependency was added in 63dca2c0b0e7a92cb39d1b1ecefa32ffda201975, because this commit had dependency on
ipv6_find_hdr, which was located in iptables-specific code
But it is no longer required, because f8f626754ebeca613cf1af2e6f890cfde0e74d5b moved them to a more common location
---
net/netfilter/ipvs/Kconfig | 1 -
1 file changed, 1 deletion(-)
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Remove ipvs v6 dependency on iptables
2020-08-27 19:48 [PATCH] Remove ipvs v6 dependency on iptables Lach
@ 2020-08-27 20:59 ` Julian Anastasov
2020-08-27 22:07 ` Lach
0 siblings, 1 reply; 10+ messages in thread
From: Julian Anastasov @ 2020-08-27 20:59 UTC (permalink / raw)
To: Lach
Cc: Wensong Zhang, Simon Horman, Pablo Neira Ayuso, Jozsef Kadlecsik,
Florian Westphal, David S. Miller, Jakub Kicinski, netdev,
lvs-devel, netfilter-devel, coreteam, linux-kernel
Hello,
On Fri, 28 Aug 2020, Lach wrote:
> This dependency was added in 63dca2c0b0e7a92cb39d1b1ecefa32ffda201975, because this commit had dependency on
> ipv6_find_hdr, which was located in iptables-specific code
>
> But it is no longer required, because f8f626754ebeca613cf1af2e6f890cfde0e74d5b moved them to a more common location
May be then we should also not include ip6_tables.h from
include/net/ip_vs.h ?
> ---
> net/netfilter/ipvs/Kconfig | 1 -
> 1 file changed, 1 deletion(-)
>
> 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>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] Remove ipvs v6 dependency on iptables
2020-08-27 20:59 ` Julian Anastasov
@ 2020-08-27 22:07 ` Lach
2020-08-28 15:08 ` Nicolas Dichtel
0 siblings, 1 reply; 10+ messages in thread
From: Lach @ 2020-08-27 22:07 UTC (permalink / raw)
To: ja
Cc: iam, David S. Miller, Alexey Kuznetsov, Hideaki YOSHIFUJI,
Wensong Zhang, Simon Horman, Jakub Kicinski, Pablo Neira Ayuso,
Jozsef Kadlecsik, Florian Westphal, netdev, lvs-devel,
linux-kernel, netfilter-devel, coreteam
This dependency was added in 63dca2c0b0e7a92cb39d1b1ecefa32ffda201975, because this commit had dependency on
ipv6_find_hdr, which was located in iptables-specific code
But it is no longer required, because f8f626754ebeca613cf1af2e6f890cfde0e74d5b moved them to a more common location
---
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Remove ipvs v6 dependency on iptables
2020-08-27 22:07 ` Lach
@ 2020-08-28 15:08 ` Nicolas Dichtel
2020-08-29 8:50 ` Yaroslav Bolyukin
0 siblings, 1 reply; 10+ messages in thread
From: Nicolas Dichtel @ 2020-08-28 15:08 UTC (permalink / raw)
To: Lach, ja
Cc: David S. Miller, Alexey Kuznetsov, Hideaki YOSHIFUJI,
Wensong Zhang, Simon Horman, Jakub Kicinski, Pablo Neira Ayuso,
Jozsef Kadlecsik, Florian Westphal, netdev, lvs-devel,
linux-kernel, netfilter-devel, coreteam
Le 28/08/2020 à 00:07, Lach a écrit :
> This dependency was added in 63dca2c0b0e7a92cb39d1b1ecefa32ffda201975, because this commit had dependency on
> ipv6_find_hdr, which was located in iptables-specific code
>
> But it is no longer required, because f8f626754ebeca613cf1af2e6f890cfde0e74d5b moved them to a more common location
> ---
Your 'Signed-off-by' is missing, the commit log lines are too long, a commit
should not be referenced like this.
Please run checkpatch on your submissions.
Regards,
Nicolas
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] Remove ipvs v6 dependency on iptables
2020-08-28 15:08 ` Nicolas Dichtel
@ 2020-08-29 8:50 ` Yaroslav Bolyukin
2020-08-29 9:58 ` Julian Anastasov
0 siblings, 1 reply; 10+ messages in thread
From: Yaroslav Bolyukin @ 2020-08-29 8:50 UTC (permalink / raw)
To: ja, Nicolas Dichtel
Cc: iam, Wensong Zhang, Simon Horman, David S. Miller,
Alexey Kuznetsov, Hideaki YOSHIFUJI, Jakub Kicinski,
Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal, netdev,
lvs-devel, linux-kernel, netfilter-devel, coreteam
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(-)
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
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] Remove ipvs v6 dependency on iptables
2020-08-29 8:50 ` Yaroslav Bolyukin
@ 2020-08-29 9:58 ` Julian Anastasov
2020-08-29 10:51 ` [PATCHv4 net-next] " Yaroslav Bolyukin
2020-08-29 13:59 ` [PATCHv5 net-next] ipvs: remove dependency on ip6_tables Yaroslav Bolyukin
0 siblings, 2 replies; 10+ messages in thread
From: Julian Anastasov @ 2020-08-29 9:58 UTC (permalink / raw)
To: Yaroslav Bolyukin
Cc: Nicolas Dichtel, Wensong Zhang, Simon Horman, David S. Miller,
Alexey Kuznetsov, Hideaki YOSHIFUJI, Jakub Kicinski,
Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal, netdev,
lvs-devel, linux-kernel, netfilter-devel, coreteam
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>
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCHv4 net-next] Remove ipvs v6 dependency on iptables
2020-08-29 9:58 ` Julian Anastasov
@ 2020-08-29 10:51 ` Yaroslav Bolyukin
2020-08-29 13:59 ` [PATCHv5 net-next] ipvs: remove dependency on ip6_tables Yaroslav Bolyukin
1 sibling, 0 replies; 10+ messages in thread
From: Yaroslav Bolyukin @ 2020-08-29 10:51 UTC (permalink / raw)
To: ja
Cc: iam, Wensong Zhang, Simon Horman, David S. Miller,
Alexey Kuznetsov, Hideaki YOSHIFUJI, Jakub Kicinski,
Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal, netdev,
lvs-devel, linux-kernel, netfilter-devel, coreteam
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>
---
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
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCHv5 net-next] ipvs: remove dependency on ip6_tables
2020-08-29 9:58 ` Julian Anastasov
2020-08-29 10:51 ` [PATCHv4 net-next] " Yaroslav Bolyukin
@ 2020-08-29 13:59 ` Yaroslav Bolyukin
2020-08-31 17:12 ` Julian Anastasov
1 sibling, 1 reply; 10+ messages in thread
From: Yaroslav Bolyukin @ 2020-08-29 13:59 UTC (permalink / raw)
To: ja
Cc: iam, David S. Miller, Alexey Kuznetsov, Hideaki YOSHIFUJI,
Wensong Zhang, Simon Horman, Jakub Kicinski, Pablo Neira Ayuso,
Jozsef Kadlecsik, Florian Westphal, netdev, lvs-devel,
linux-kernel, netfilter-devel, coreteam
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(-)
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
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCHv5 net-next] ipvs: remove dependency on ip6_tables
2020-08-29 13:59 ` [PATCHv5 net-next] ipvs: remove dependency on ip6_tables Yaroslav Bolyukin
@ 2020-08-31 17:12 ` Julian Anastasov
2020-08-31 21:18 ` Pablo Neira Ayuso
0 siblings, 1 reply; 10+ messages in thread
From: Julian Anastasov @ 2020-08-31 17:12 UTC (permalink / raw)
To: Yaroslav Bolyukin
Cc: David S. Miller, Alexey Kuznetsov, Hideaki YOSHIFUJI,
Wensong Zhang, Simon Horman, Jakub Kicinski, Pablo Neira Ayuso,
Jozsef Kadlecsik, Florian Westphal, netdev, lvs-devel,
linux-kernel, netfilter-devel, coreteam
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>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCHv5 net-next] ipvs: remove dependency on ip6_tables
2020-08-31 17:12 ` Julian Anastasov
@ 2020-08-31 21:18 ` Pablo Neira Ayuso
0 siblings, 0 replies; 10+ messages in thread
From: Pablo Neira Ayuso @ 2020-08-31 21:18 UTC (permalink / raw)
To: Julian Anastasov
Cc: Yaroslav Bolyukin, David S. Miller, Alexey Kuznetsov,
Hideaki YOSHIFUJI, Wensong Zhang, Simon Horman, Jakub Kicinski,
Jozsef Kadlecsik, Florian Westphal, netdev, lvs-devel,
linux-kernel, netfilter-devel, coreteam
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.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-08-31 21:18 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-27 19:48 [PATCH] Remove ipvs v6 dependency on iptables Lach
2020-08-27 20:59 ` Julian Anastasov
2020-08-27 22:07 ` Lach
2020-08-28 15:08 ` Nicolas Dichtel
2020-08-29 8:50 ` Yaroslav Bolyukin
2020-08-29 9:58 ` Julian Anastasov
2020-08-29 10:51 ` [PATCHv4 net-next] " Yaroslav Bolyukin
2020-08-29 13:59 ` [PATCHv5 net-next] ipvs: remove dependency on ip6_tables Yaroslav Bolyukin
2020-08-31 17:12 ` Julian Anastasov
2020-08-31 21:18 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).