* [PATCH] netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y
@ 2019-05-31 9:11 Pablo Neira Ayuso
2019-05-31 9:17 ` Pablo Neira Ayuso
2019-05-31 18:04 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2019-05-31 9:11 UTC (permalink / raw)
To: netfilter-devel; +Cc: davem, netdev, wenxu, sfr, yuehaibing, lkp
This patch fixes a few problems with CONFIG_IPV6=y and
CONFIG_NF_CONNTRACK_BRIDGE=m:
In file included from net/netfilter/utils.c:5:
include/linux/netfilter_ipv6.h: In function 'nf_ipv6_br_defrag':
include/linux/netfilter_ipv6.h:110:9: error: implicit declaration of function 'nf_ct_frag6_gather'; did you mean 'nf_ct_attach'? [-Werror=implicit-function-declaration]
And these too:
net/ipv6/netfilter.c:242:2: error: unknown field 'br_defrag' specified in initializer
net/ipv6/netfilter.c:243:2: error: unknown field 'br_fragment' specified in initializer
This patch includes an original chunk from wenxu.
Fixes: 764dd163ac92 ("netfilter: nf_conntrack_bridge: add support for IPv6")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/linux/netfilter_ipv6.h | 2 ++
net/ipv6/netfilter.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index a21b8c9623ee..3a3dc4b1f0e7 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -96,6 +96,8 @@ static inline int nf_ip6_route(struct net *net, struct dst_entry **dst,
#endif
}
+#include <net/netfilter/ipv6/nf_defrag_ipv6.h>
+
static inline int nf_ipv6_br_defrag(struct net *net, struct sk_buff *skb,
u32 user)
{
diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index c6665382acb5..9530cc280953 100644
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -238,7 +238,7 @@ static const struct nf_ipv6_ops ipv6ops = {
.route_input = ip6_route_input,
.fragment = ip6_fragment,
.reroute = nf_ip6_reroute,
-#if IS_MODULE(CONFIG_NF_CONNTRACK_BRIDGE)
+#if IS_MODULE(CONFIG_IPV6)
.br_defrag = nf_ct_frag6_gather,
.br_fragment = br_ip6_fragment,
#endif
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y
2019-05-31 9:11 [PATCH] netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y Pablo Neira Ayuso
@ 2019-05-31 9:17 ` Pablo Neira Ayuso
2019-05-31 18:04 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2019-05-31 9:17 UTC (permalink / raw)
To: netfilter-devel; +Cc: davem, netdev, wenxu, sfr, yuehaibing, lkp
On Fri, May 31, 2019 at 11:11:24AM +0200, Pablo Neira Ayuso wrote:
> This patch fixes a few problems with CONFIG_IPV6=y and
> CONFIG_NF_CONNTRACK_BRIDGE=m:
>
> In file included from net/netfilter/utils.c:5:
> include/linux/netfilter_ipv6.h: In function 'nf_ipv6_br_defrag':
> include/linux/netfilter_ipv6.h:110:9: error: implicit declaration of function 'nf_ct_frag6_gather'; did you mean 'nf_ct_attach'? [-Werror=implicit-function-declaration]
>
> And these too:
>
> net/ipv6/netfilter.c:242:2: error: unknown field 'br_defrag' specified in initializer
> net/ipv6/netfilter.c:243:2: error: unknown field 'br_fragment' specified in initializer
>
> This patch includes an original chunk from wenxu.
Oops, sending v2. Missing net-next tag. Sorry.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y
2019-05-31 9:11 [PATCH] netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y Pablo Neira Ayuso
2019-05-31 9:17 ` Pablo Neira Ayuso
@ 2019-05-31 18:04 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2019-05-31 18:04 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel, netdev, wenxu, sfr, yuehaibing, lkp
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 31 May 2019 11:11:24 +0200
> This patch fixes a few problems with CONFIG_IPV6=y and
> CONFIG_NF_CONNTRACK_BRIDGE=m:
>
> In file included from net/netfilter/utils.c:5:
> include/linux/netfilter_ipv6.h: In function 'nf_ipv6_br_defrag':
> include/linux/netfilter_ipv6.h:110:9: error: implicit declaration of function 'nf_ct_frag6_gather'; did you mean 'nf_ct_attach'? [-Werror=implicit-function-declaration]
>
> And these too:
>
> net/ipv6/netfilter.c:242:2: error: unknown field 'br_defrag' specified in initializer
> net/ipv6/netfilter.c:243:2: error: unknown field 'br_fragment' specified in initializer
>
> This patch includes an original chunk from wenxu.
>
> Fixes: 764dd163ac92 ("netfilter: nf_conntrack_bridge: add support for IPv6")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-31 18:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-31 9:11 [PATCH] netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y Pablo Neira Ayuso
2019-05-31 9:17 ` Pablo Neira Ayuso
2019-05-31 18:04 ` David Miller
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).