| Message ID | 20190531091526.1671-1-pablo@netfilter.org |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next,v2] netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y | expand |
Signed-off-by: wenxu <wenxu@ucloud.cn> On 5/31/2019 5:15 PM, 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. > > Fixes: 764dd163ac92 ("netfilter: nf_conntrack_bridge: add support for IPv6") > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Reported-by: Yuehaibing <yuehaibing@huawei.com> > Reported-by: kbuild test robot <lkp@intel.com> > Reported-by: wenxu <wenxu@ucloud.cn> > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > --- > v2: Forgot to include "net-next" and added Reported-by to all people that have > reported problems. > > 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
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
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> Reported-by: Yuehaibing <yuehaibing@huawei.com> Reported-by: kbuild test robot <lkp@intel.com> Reported-by: wenxu <wenxu@ucloud.cn> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- v2: Forgot to include "net-next" and added Reported-by to all people that have reported problems. include/linux/netfilter_ipv6.h | 2 ++ net/ipv6/netfilter.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)