| Message ID | 20190412163720.576c6610@canb.auug.org.au |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | linux-next: build failure after merge of the netfilter-next tree | expand |
Stephen Rothwell <sfr@canb.auug.org.au> wrote: > After merging the netfilter tree, today's linux-next build (powerpc > ppc44x_defconfig) failed like this: > > In file included from /home/sfr/next/next/net/bridge/br_input.c:19: > /home/sfr/next/next/include/net/netfilter/nf_queue.h:16:23: error: field 'state' > has incomplete type > struct nf_hook_state state; > ^~~~~ > Caused by commit > > 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path") > > This build has CONFIG_NETFILTER not set. > > I have applied this patch for today: Can you submit this fix formally to netfilter-devel@vger.kernel.org?
On Fri, Apr 12, 2019 at 04:37:20PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the netfilter tree, today's linux-next build (powerpc > ppc44x_defconfig) failed like this: > > In file included from /home/sfr/next/next/net/bridge/br_input.c:19: > /home/sfr/next/next/include/net/netfilter/nf_queue.h:16:23: error: field 'state' > has incomplete type > struct nf_hook_state state; > ^~~~~ > > Caused by commit > > 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path") > > This build has CONFIG_NETFILTER not set. I have applied this to nf-next, thanks.
Hi Florian, On Fri, 12 Apr 2019 10:15:27 +0200 Florian Westphal <fw@strlen.de> wrote: > > Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > After merging the netfilter tree, today's linux-next build (powerpc > > ppc44x_defconfig) failed like this: > > > > In file included from /home/sfr/next/next/net/bridge/br_input.c:19: > > /home/sfr/next/next/include/net/netfilter/nf_queue.h:16:23: error: field 'state' > > has incomplete type > > struct nf_hook_state state; > > ^~~~~ > > Caused by commit > > > > 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path") > > > > This build has CONFIG_NETFILTER not set. > > > > I have applied this patch for today: > > Can you submit this fix formally to netfilter-devel@vger.kernel.org? Done. Though I was hoping someone might come up with a better solution (I don't particularly like conditional inclusions).
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index e0aacfedcfe1..86dc46f6a68f 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -16,7 +16,9 @@ #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/netfilter_bridge.h> +#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE #include <net/netfilter/nf_queue.h> +#endif #include <linux/neighbour.h> #include <net/arp.h> #include <linux/export.h>
Hi all, After merging the netfilter tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this: In file included from /home/sfr/next/next/net/bridge/br_input.c:19: /home/sfr/next/next/include/net/netfilter/nf_queue.h:16:23: error: field 'state' has incomplete type struct nf_hook_state state; ^~~~~ Caused by commit 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path") This build has CONFIG_NETFILTER not set. I have applied this patch for today: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 12 Apr 2019 16:32:47 +1000 Subject: [PATCH] bridge: only include nf_queue.h if needed --- net/bridge/br_input.c | 2 ++ 1 file changed, 2 insertions(+)