Patchwork netfilter: nf_defrag_ipv6.o included twice

login
register
mail settings
Submitter Nathan Hintz
Date Aug. 23, 2013, 5:09 a.m.
Message ID <BLU0-SMTP246C0F210C1747FE63C4E97AC4E0@phx.gbl>
Download mbox | patch
Permalink /patch/269297/
State Accepted
Headers show

Comments

Nathan Hintz - Aug. 23, 2013, 5:09 a.m.
'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>
---
 net/ipv6/netfilter/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Pablo Neira - Aug. 27, 2013, 10:50 p.m.
On Thu, Aug 22, 2013 at 10:09:12PM -0700, Nathan Hintz wrote:
> 'nf_defrag_ipv6' is built as a separate module; it shouldn't be
> included in the 'nf_conntrack_ipv6' module as well.

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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