summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2019-04-13 00:03:36 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2019-04-15 12:47:36 -0400
commitdc2f4189dcd2c87e211d30d9524ae8ebe19af577 (patch)
tree692eddd20da9043df4f2ad488ecb91ac4609b30c
parent223fd0adfa8af36d5d9b5d38016e579ee052f367 (diff)
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>
-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 @@
16#include <linux/netdevice.h> 16#include <linux/netdevice.h>
17#include <linux/etherdevice.h> 17#include <linux/etherdevice.h>
18#include <linux/netfilter_bridge.h> 18#include <linux/netfilter_bridge.h>
19#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
19#include <net/netfilter/nf_queue.h> 20#include <net/netfilter/nf_queue.h>
21#endif
20#include <linux/neighbour.h> 22#include <linux/neighbour.h>
21#include <net/arp.h> 23#include <net/arp.h>
22#include <linux/export.h> 24#include <linux/export.h>