summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_input.c
diff options
context:
space:
mode:
authorStephen Rothwell2019-04-13 06:03:36 +0200
committerPablo Neira Ayuso2019-04-15 18:47:36 +0200
commitdc2f4189dcd2c87e211d30d9524ae8ebe19af577 (patch)
tree692eddd20da9043df4f2ad488ecb91ac4609b30c /net/bridge/br_input.c
parentbridge: broute: make broute a real ebtables table (diff)
downloadkernel-qcow2-linux-dc2f4189dcd2c87e211d30d9524ae8ebe19af577.tar.gz
kernel-qcow2-linux-dc2f4189dcd2c87e211d30d9524ae8ebe19af577.tar.xz
kernel-qcow2-linux-dc2f4189dcd2c87e211d30d9524ae8ebe19af577.zip
bridge: only include nf_queue.h if needed
After merging the netfilter-next tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this: In file included from net/bridge/br_input.c:19: include/net/netfilter/nf_queue.h:16:23: error: field 'state' has incomplete type struct nf_hook_state state; ^~~~~ Fixes: 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge/br_input.c')
-rw-r--r--net/bridge/br_input.c2
1 files changed, 2 insertions, 0 deletions
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>