]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module
authorFlorian Westphal <fw@strlen.de>
Tue, 23 Apr 2019 17:48:23 +0000 (10:48 -0700)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
commitcf1b4a13434013a0777ba6fa52414175af13ce78
tree03af4d9bbd0f12a27f16ed26fc18bab042ad40c6
parentc76249de43c2f0aeaea1c4fb07a3309c03086d1d
ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module

BugLink: https://bugs.launchpad.net/bugs/1838349
[ Upstream commit 70b095c84326640eeacfd69a411db8fc36e8ab1a ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
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