From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Pablo Neira Ayuso <pablo@netfilter.org>,
NetFilter <netfilter-devel@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Florian Westphal <fw@strlen.de>,
"David S. Miller" <davem@davemloft.net>,
Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Subject: linux-next: build failure after merge of the netfilter-next tree
Date: Fri, 12 Apr 2019 16:37:20 +1000 [thread overview]
Message-ID: <20190412163720.576c6610@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]
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(+)
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>
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-04-12 6:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 6:37 Stephen Rothwell [this message]
2019-04-12 8:15 ` linux-next: build failure after merge of the netfilter-next tree Florian Westphal
2019-04-13 4:05 ` Stephen Rothwell
2019-04-12 16:36 ` Pablo Neira Ayuso
-- strict thread matches above, loose matches on Subject: below --
2019-07-08 3:39 Stephen Rothwell
2019-07-09 3:59 ` Stephen Rothwell
2019-06-20 13:47 Stephen Rothwell
2019-06-20 13:57 ` Pablo Neira Ayuso
2019-06-20 14:16 ` Stephen Rothwell
2019-02-13 5:54 Stephen Rothwell
2019-01-20 23:36 Stephen Rothwell
2018-10-15 23:41 Stephen Rothwell
2018-10-16 8:02 ` Pablo Neira Ayuso
2018-07-18 1:50 Stephen Rothwell
2016-08-18 1:56 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190412163720.576c6610@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=nikolay@cumulusnetworks.com \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).