]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: conntrack: Force inlining of build check to prevent build failure
authorGeert Uytterhoeven <geert@linux-m68k.org>
Wed, 3 May 2017 12:18:43 +0000 (14:18 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 May 2017 13:51:26 +0000 (09:51 -0400)
commitf5ff5c4ac3ed65d58176a1360d0fe3e71c34e8dd
tree3cf4134100913ec3f6ca58902ec3d700cb713726
parent9e9f5251865300fc7028214fb9b9b5337701a835
netfilter: conntrack: Force inlining of build check to prevent build failure

If gcc (e.g. 4.1.2) decides not to inline total_extension_size(), the
build will fail with:

    net/built-in.o: In function `nf_conntrack_init_start':
    (.text+0x9baf6): undefined reference to `__compiletime_assert_1893'

or

    ERROR: "__compiletime_assert_1893" [net/netfilter/nf_conntrack.ko] undefined!

Fix this by forcing inlining of total_extension_size().

Fixes: 8c45b5c3e68dc015 ("netfilter: conntrack: use u8 for extension sizes again")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_core.c