* [PATCH net-next] netfilter: nf_conntrack_bridge: Fix build error without IPV6
@ 2019-05-31 2:46 YueHaibing
2019-05-31 3:06 ` Yuehaibing
0 siblings, 1 reply; 4+ messages in thread
From: YueHaibing @ 2019-05-31 2:46 UTC (permalink / raw)
To: pablo, kadlec, fw; +Cc: linux-kernel, coreteam, netfilter-devel, YueHaibing
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)
{
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next] netfilter: nf_conntrack_bridge: Fix build error without IPV6
2019-05-31 2:46 [PATCH net-next] netfilter: nf_conntrack_bridge: Fix build error without IPV6 YueHaibing
@ 2019-05-31 3:06 ` Yuehaibing
2019-05-31 8:02 ` Pablo Neira Ayuso
0 siblings, 1 reply; 4+ messages in thread
From: Yuehaibing @ 2019-05-31 3:06 UTC (permalink / raw)
To: pablo, kadlec, fw; +Cc: linux-kernel, coreteam, netfilter-devel, netdev
+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)
> {
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next] netfilter: nf_conntrack_bridge: Fix build error without IPV6
2019-05-31 3:06 ` Yuehaibing
@ 2019-05-31 8:02 ` Pablo Neira Ayuso
2019-05-31 9:05 ` Yuehaibing
0 siblings, 1 reply; 4+ messages in thread
From: Pablo Neira Ayuso @ 2019-05-31 8:02 UTC (permalink / raw)
To: Yuehaibing; +Cc: kadlec, fw, linux-kernel, coreteam, netfilter-devel, netdev
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --]
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?
[-- Attachment #2: x.patch --]
[-- Type: text/x-diff, Size: 441 bytes --]
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)
{
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next] netfilter: nf_conntrack_bridge: Fix build error without IPV6
2019-05-31 8:02 ` Pablo Neira Ayuso
@ 2019-05-31 9:05 ` Yuehaibing
0 siblings, 0 replies; 4+ messages in thread
From: Yuehaibing @ 2019-05-31 9:05 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: kadlec, fw, linux-kernel, coreteam, netfilter-devel, netdev
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.
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-31 9:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-31 2:46 [PATCH net-next] netfilter: nf_conntrack_bridge: Fix build error without IPV6 YueHaibing
2019-05-31 3:06 ` Yuehaibing
2019-05-31 8:02 ` Pablo Neira Ayuso
2019-05-31 9:05 ` Yuehaibing
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).