summaryrefslogtreecommitdiff
path: root/net/bridge/Makefile
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2015-06-16 14:07:03 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-06-18 21:14:21 +0200
commit230ac490f7fba2aea52914c69d14b15dd515e49c (patch)
tree2294ad4b946d120a14b2862b42555ce8e9d182ec /net/bridge/Makefile
parentc4e70a87d975d1f561a00abfe2d3cefa2a486c95 (diff)
netfilter: bridge: split ipv6 code into separated file
Resolve compilation breakage when CONFIG_IPV6 is not set by moving the IPv6 code into a separated br_netfilter_ipv6.c file. Fixes: efb6de9b4ba0 ("netfilter: bridge: forward IPv6 fragmented packets") Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge/Makefile')
-rw-r--r--net/bridge/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/Makefile b/net/bridge/Makefile
index c52577ac718e..a1cda5d4718d 100644
--- a/net/bridge/Makefile
+++ b/net/bridge/Makefile
@@ -13,6 +13,7 @@ bridge-$(CONFIG_SYSFS) += br_sysfs_if.o br_sysfs_br.o
bridge-$(subst m,y,$(CONFIG_BRIDGE_NETFILTER)) += br_nf_core.o
br_netfilter-y := br_netfilter_hooks.o
+br_netfilter-$(subst m,y,$(CONFIG_IPV6)) += br_netfilter_ipv6.o
obj-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o
bridge-$(CONFIG_BRIDGE_IGMP_SNOOPING) += br_multicast.o br_mdb.o