]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
udp: provide udp{4,6}_lib_lookup for nf_socket_ipv{4,6}
authorArnd Bergmann <arnd@arndb.de>
Tue, 8 Nov 2016 13:28:18 +0000 (14:28 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 9 Nov 2016 23:05:14 +0000 (00:05 +0100)
commit30f581584873cca433c81cbcd4d8f3382348fbaa
tree10895f6bb69187aff0d718b48ba2eddc0aa4eb74
parent0e54d2179f650bac80d89a9def429dbdbed58c11
udp: provide udp{4,6}_lib_lookup for nf_socket_ipv{4,6}

Since commit ca065d0cf80f ("udp: no longer use SLAB_DESTROY_BY_RCU")
the udp6_lib_lookup and udp4_lib_lookup functions are only
provided when it is actually possible to call them.

However, moving the callers now caused a link error:

net/built-in.o: In function `nf_sk_lookup_slow_v6':
(.text+0x131a39): undefined reference to `udp6_lib_lookup'
net/ipv4/netfilter/nf_socket_ipv4.o: In function `nf_sk_lookup_slow_v4':
nf_socket_ipv4.c:(.text.nf_sk_lookup_slow_v4+0x114): undefined reference to `udp4_lib_lookup'

This extends the #ifdef so we also provide the functions when
CONFIG_NF_SOCKET_IPV4 or CONFIG_NF_SOCKET_IPV6, respectively
are set.

Fixes: 8db4c5be88f6 ("netfilter: move socket lookup infrastructure to nf_socket_ipv{4,6}.c")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/ipv4/udp.c
net/ipv6/udp.c