Skip to contentSkip to conversation

netfilter: add nf_queue_entry forward declaration

PATCH Applied Arnd Bergmann 3 participants 3 messages Jan 2, 2018 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netfilter: add nf_queue_entry forward declaration

The newly added callback pointers cause a warning for some configurations:

In file included from net/ipv6/af_inet6.c:45:0:
include/linux/netfilter_ipv6.h:38:51: error: 'struct nf_queue_entry' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]

Adding a forward declaration for the type avoids the warnings.

Fixes 9faa679ee7ec ("netfilter: move reroute indirection to struct nf_ipv6_ops")
---
 include/linux/netfilter_ipv4.h | 2 ++
 include/linux/netfilter_ipv6.h | 2 ++
 2 files changed, 4 insertions(+)
include/linux/netfilter_ipv4.h +2 -0
index 0259bcde6d2e..b31dabfdb453 100644
@@ -18,6 +18,8 @@ struct ip_rt_info {
 
 int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned addr_type);
 
+struct nf_queue_entry;
+
 #ifdef CONFIG_INET
 __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
 		       unsigned int dataoff, u_int8_t protocol);
include/linux/netfilter_ipv6.h +2 -0
index e4cdcfdce0f9..288c597e75b3 100644
@@ -18,6 +18,8 @@ struct ip6_rt_info {
 	u_int32_t mark;
 };
 
+struct nf_queue_entry;
+
 /*
  * Hook functions for ipv6 to allow xt_* modules to be built-in even
  * if IPv6 is a module.
Signature · 1 line
2.9.0
maintainer Applied
#1 lore raw
Quoted 6 lines · Arnd Bergmann

The newly added callback pointers cause a warning for some configurations:

In file included from net/ipv6/af_inet6.c:45:0:
include/linux/netfilter_ipv6.h:38:51: error: 'struct nf_queue_entry' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]

Adding a forward declaration for the type avoids the warnings.

Applied, thanks Arnd.

#2 lore raw
In reply to Arnd Bergmann
Quoted 9 lines · Arnd Bergmann

The newly added callback pointers cause a warning for some configurations:

In file included from net/ipv6/af_inet6.c:45:0:
include/linux/netfilter_ipv6.h:38:51: error: 'struct nf_queue_entry' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]

Adding a forward declaration for the type avoids the warnings.

Fixes 9faa679ee7ec ("netfilter: move reroute indirection to struct nf_ipv6_ops")

Thanks.

Quoted 32 lines
---
 include/linux/netfilter_ipv4.h | 2 ++
 include/linux/netfilter_ipv6.h | 2 ++
 2 files changed, 4 insertions(+)
include/linux/netfilter_ipv4.h +2 -0
index 0259bcde6d2e..b31dabfdb453 100644
@@ -18,6 +18,8 @@ struct ip_rt_info {
 
 int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned addr_type);
 
+struct nf_queue_entry;
+
 #ifdef CONFIG_INET
 __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
 		       unsigned int dataoff, u_int8_t protocol);
include/linux/netfilter_ipv6.h +2 -0
index e4cdcfdce0f9..288c597e75b3 100644
@@ -18,6 +18,8 @@ struct ip6_rt_info {
 	u_int32_t mark;
 };
 
+struct nf_queue_entry;
+
 /*
  * Hook functions for ipv6 to allow xt_* modules to be built-in even
  * if IPv6 is a module.
Signature · 1 line
~Randy