diff options
| author |   Nathan Hintz <nlhintz@hotmail.com> | 2013-08-22 22:09:12 -0700 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2013-08-28 00:13:41 +0200 |
| commit | 706f5151e349a3d8ab85237d0d6c553930376e9f (patch) | |
| tree | 0b7b011c8c070b3db7fa155505ecb0824a9d1273 /net | |
| parent | netfilter: ip[6]t_REJECT: tcp-reset using wrong MAC source if bridged (diff) | |
| download | linux-dev-706f5151e349a3d8ab85237d0d6c553930376e9f.tar.xz linux-dev-706f5151e349a3d8ab85237d0d6c553930376e9f.zip | |
netfilter: nf_defrag_ipv6.o included twice
'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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/netfilter/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile index 2d11fcc2cf3c..ad13bf0d25f0 100644 --- a/net/ipv6/netfilter/Makefile +++ b/net/ipv6/netfilter/Makefile @@ -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 |