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>
Showing
- include/net/ipv6.h 0 additions, 28 deletionsinclude/net/ipv6.h
- include/net/ipv6_frag.h 104 additions, 0 deletionsinclude/net/ipv6_frag.h
- net/ieee802154/6lowpan/reassembly.c 1 addition, 1 deletionnet/ieee802154/6lowpan/reassembly.c
- net/ipv6/netfilter/nf_conntrack_reasm.c 12 additions, 5 deletionsnet/ipv6/netfilter/nf_conntrack_reasm.c
- net/ipv6/netfilter/nf_defrag_ipv6_hooks.c 1 addition, 2 deletionsnet/ipv6/netfilter/nf_defrag_ipv6_hooks.c
- net/ipv6/reassembly.c 7 additions, 85 deletionsnet/ipv6/reassembly.c
- net/openvswitch/conntrack.c 1 addition, 0 deletionsnet/openvswitch/conntrack.c
Loading
Please register or sign in to comment