| Message ID | 20190531024643.3840-1-yuehaibing@huawei.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [net-next] netfilter: nf_conntrack_bridge: Fix build error without IPV6 | expand |
+cc netdev On 2019/5/31 10:46, YueHaibing wrote: > Fix gcc build error while CONFIG_IPV6 is not set > > In file included from net/netfilter/core.c:19:0: > ./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' [-Werror=implicit-function-declaration] > > Reported-by: Hulk Robot <hulkci@huawei.com> > Fixes: 764dd163ac92 ("netfilter: nf_conntrack_bridge: add support for IPv6") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > include/linux/netfilter_ipv6.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h > index a21b8c9..4ea97fd 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 > } > > +int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user); > + > static inline int nf_ipv6_br_defrag(struct net *net, struct sk_buff *skb, > u32 user) > { >
On Fri, May 31, 2019 at 11:06:49AM +0800, Yuehaibing wrote: > +cc netdev > > On 2019/5/31 10:46, YueHaibing wrote: > > Fix gcc build error while CONFIG_IPV6 is not set > > > > In file included from net/netfilter/core.c:19:0: > > ./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' [-Werror=implicit-function-declaration] > > > > Reported-by: Hulk Robot <hulkci@huawei.com> > > Fixes: 764dd163ac92 ("netfilter: nf_conntrack_bridge: add support for IPv6") > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > --- > > include/linux/netfilter_ipv6.h | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h > > index a21b8c9..4ea97fd 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 > > } > > > > +int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user); > > + This is already defined in: include/net/netfilter/ipv6/nf_defrag_ipv6.h Probably this?
On 2019/5/31 16:02, Pablo Neira Ayuso wrote: > On Fri, May 31, 2019 at 11:06:49AM +0800, Yuehaibing wrote: >> +cc netdev >> >> On 2019/5/31 10:46, YueHaibing wrote: >>> Fix gcc build error while CONFIG_IPV6 is not set >>> >>> In file included from net/netfilter/core.c:19:0: >>> ./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' [-Werror=implicit-function-declaration] >>> >>> Reported-by: Hulk Robot <hulkci@huawei.com> >>> Fixes: 764dd163ac92 ("netfilter: nf_conntrack_bridge: add support for IPv6") >>> Signed-off-by: YueHaibing <yuehaibing@huawei.com> >>> --- >>> include/linux/netfilter_ipv6.h | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h >>> index a21b8c9..4ea97fd 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 >>> } >>> >>> +int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user); >>> + > > This is already defined in: > > include/net/netfilter/ipv6/nf_defrag_ipv6.h > > Probably this? Yes, this works for me. >
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h index a21b8c9..4ea97fd 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 } +int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user); + static inline int nf_ipv6_br_defrag(struct net *net, struct sk_buff *skb, u32 user) {
Fix gcc build error while CONFIG_IPV6 is not set In file included from net/netfilter/core.c:19:0: ./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' [-Werror=implicit-function-declaration] Reported-by: Hulk Robot <hulkci@huawei.com> Fixes: 764dd163ac92 ("netfilter: nf_conntrack_bridge: add support for IPv6") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- include/linux/netfilter_ipv6.h | 2 ++ 1 file changed, 2 insertions(+)