Commit dc2f4189 authored Apr 13, 2019 by Stephen Rothwell Committed by Pablo Neira Ayuso Apr 15, 2019

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: 971502d7 ("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>

parent 223fd0ad

net/bridge/br_input.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,9 @@
	#include <linux/netdevice.h>		#include <linux/netdevice.h>
	#include <linux/etherdevice.h>		#include <linux/etherdevice.h>
	#include <linux/netfilter_bridge.h>		#include <linux/netfilter_bridge.h>
			#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
	#include <net/netfilter/nf_queue.h>		#include <net/netfilter/nf_queue.h>
			#endif
	#include <linux/neighbour.h>		#include <linux/neighbour.h>
	#include <net/arp.h>		#include <net/arp.h>
	#include <linux/export.h>		#include <linux/export.h>

Admin message