netfilter: nf_defrag_ipv6.o included twice
authorNathan Hintz <nlhintz@hotmail.com>
Fri, 23 Aug 2013 05:09:12 +0000 (22:09 -0700)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 27 Aug 2013 22:13:41 +0000 (00:13 +0200)
'nf_defrag_ipv6' is built as a separate module; it shouldn't be
included in the 'nf_conntrack_ipv6' module as well.

Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/ipv6/netfilter/Makefile

index 2d11fcc2cf3c5c3906b851e9c5daad69de26e0ed..ad13bf0d25f055c14cc1f3aae2ce538781285be5 100644 (file)
@@ -14,7 +14,7 @@ obj-$(CONFIG_NF_NAT_IPV6) += ip6table_nat.o
 nf_conntrack_ipv6-y  :=  nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o
 
 # l3 independent conntrack
-obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o nf_defrag_ipv6.o
+obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o
 
 nf_nat_ipv6-y          := nf_nat_l3proto_ipv6.o nf_nat_proto_icmpv6.o
 obj-$(CONFIG_NF_NAT_IPV6) += nf_nat_ipv6.o