diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2017-05-03 14:18:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-03 09:51:26 -0400 |
| commit | ab71632c457269a6f3ec5a233c7a83682ae27019 (patch) | |
| tree | 3cf4134100913ec3f6ca58902ec3d700cb713726 | |
| parent | 86f8e247b960d6cf4cad8b65162e73301c5a58ec (diff) | |
| download | op-kernel-dev-ab71632c457269a6f3ec5a233c7a83682ae27019.zip op-kernel-dev-ab71632c457269a6f3ec5a233c7a83682ae27019.tar.gz | |
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: b3a5db109e0670d6 ("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>
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index f9245db..3c8f1ed 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1853,7 +1853,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_set_hashsize); module_param_call(hashsize, nf_conntrack_set_hashsize, param_get_uint, &nf_conntrack_htable_size, 0600); -static unsigned int total_extension_size(void) +static __always_inline unsigned int total_extension_size(void) { /* remember to add new extensions below */ BUILD_BUG_ON(NF_CT_EXT_NUM > 9); |
