OSDN Git Service

bpfilter: fix building without CONFIG_INET
authorArnd Bergmann <arnd@arndb.de>
Tue, 29 May 2018 09:55:06 +0000 (11:55 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 May 2018 12:13:35 +0000 (08:13 -0400)
commitd71dbdaa2d94d425fff4a59e10eb5be9f61a2661
tree8c5e8f5cfee998d332b4a1797c0fc1d7cec41563
parentf03329627b46c28f0682040e7ddbfd346b78bd4e
bpfilter: fix building without CONFIG_INET

bpfilter_process_sockopt is a callback that gets called from
ip_setsockopt() and ip_getsockopt(). However, when CONFIG_INET is
disabled, it never gets called at all, and assigning a function to the
callback pointer results in a link failure:

net/bpfilter/bpfilter_kern.o: In function `__stop_umh':
bpfilter_kern.c:(.text.unlikely+0x3): undefined reference to `bpfilter_process_sockopt'
net/bpfilter/bpfilter_kern.o: In function `load_umh':
bpfilter_kern.c:(.init.text+0x73): undefined reference to `bpfilter_process_sockopt'

Since there is no caller in this configuration, I assume we can
simply make the assignment conditional.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bpfilter/bpfilter_kern.c