From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 2/8] netfilter: nf_defrag_ipv6.o included twice
Date: Wed, 28 Aug 2013 00:53:32 +0200 [thread overview]
Message-ID: <1377644018-15685-3-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1377644018-15685-1-git-send-email-pablo@netfilter.org>
From: Nathan Hintz <nlhintz@hotmail.com>
'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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile
index 2d11fcc..ad13bf0 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
--
1.7.10.4
next prev parent reply other threads:[~2013-08-27 22:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 22:53 [PATCH 0/8] netfilter updates for net-next Pablo Neira Ayuso
2013-08-27 22:53 ` [PATCH 1/8] netfilter: ip[6]t_REJECT: tcp-reset using wrong MAC source if bridged Pablo Neira Ayuso
2013-08-27 22:53 ` Pablo Neira Ayuso [this message]
2013-08-27 22:53 ` [PATCH 3/8] netfilter: nf_conntrack: make sequence number adjustments usuable without NAT Pablo Neira Ayuso
2013-08-27 22:53 ` [PATCH 4/8] net: syncookies: export cookie_v4_init_sequence/cookie_v4_check Pablo Neira Ayuso
2013-08-27 22:53 ` [PATCH 5/8] netfilter: add SYNPROXY core/target Pablo Neira Ayuso
2013-08-27 22:53 ` [PATCH 6/8] net: syncookies: export cookie_v6_init_sequence/cookie_v6_check Pablo Neira Ayuso
2013-08-27 22:53 ` [PATCH 7/8] netfilter: add IPv6 SYNPROXY target Pablo Neira Ayuso
2013-08-27 22:53 ` [PATCH 8/8] netfilter: ctnetlink: fix uninitialized variable Pablo Neira Ayuso
2013-08-28 2:07 ` [PATCH 0/8] netfilter updates for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377644018-15685-3-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).