netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH v2 1/1 netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y
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.
---
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(-)
include/linux/netfilter_ipv6.h +2 -0
@@ -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) {
net/ipv6/netfilter.c +1 -1
@@ -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
Signature · 1 line
2.11.0
Quoted 54 lines · Pablo Neira Ayuso
This patch fixes a few problems with
CONFIG_IPV6=yandCONFIG_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 initializernet/ipv6/netfilter.c:243:2: error: unknown field 'br_fragment' specified in initializerThis patch includes an original chunk from wenxu.
Fixes 764dd163ac92 ("netfilter: nf_conntrack_bridge: add support for IPv6")Reported-by Stephen Rothwell <[email protected]>Reported-by Yuehaibing <[email protected]>Reported-by kbuild test robot <[email protected]>Reported-by wenxu <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>---
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(-)include/linux/netfilter_ipv6.h +2
-0@@ -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) {net/ipv6/netfilter.c +1
-1@@ -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