ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module
authorFlorian Westphal <fw@strlen.de>
Fri, 13 Jul 2018 23:14:01 +0000 (01:14 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 18 Jul 2018 09:26:53 +0000 (11:26 +0200)
commit70b095c84326640eeacfd69a411db8fc36e8ab1a
treea84072adf7344774350d726525b2cac2aa32409d
parent7d25f8851a2c03319bfa8e56bb40bde2c4621392
ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module

IPV6=m
DEFRAG_IPV6=m
CONNTRACK=y yields:

net/netfilter/nf_conntrack_proto.o: In function `nf_ct_netns_do_get':
net/netfilter/nf_conntrack_proto.c:802: undefined reference to `nf_defrag_ipv6_enable'
net/netfilter/nf_conntrack_proto.o:(.rodata+0x640): undefined reference to `nf_conntrack_l4proto_icmpv6'

Setting DEFRAG_IPV6=y causes undefined references to ip6_rhash_params
ip6_frag_init and ip6_expire_frag_queue so it would be needed to force
IPV6=y too.

This patch gets rid of the 'followup linker error' by removing
the dependency of ipv6.ko symbols from netfilter ipv6 defrag.

Shared code is placed into a header, then used from both.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/net/ipv6.h
include/net/ipv6_frag.h [new file with mode: 0644]
net/ieee802154/6lowpan/reassembly.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
net/ipv6/reassembly.c
net/openvswitch/conntrack.c