Skip to content

Commit ab71632

Browse files
geertudavem330
authored andcommitted
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: b3a5db1 ("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>
1 parent 86f8e24 commit ab71632

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/netfilter/nf_conntrack_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1853,7 +1853,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_set_hashsize);
18531853
module_param_call(hashsize, nf_conntrack_set_hashsize, param_get_uint,
18541854
&nf_conntrack_htable_size, 0600);
18551855

1856-
static unsigned int total_extension_size(void)
1856+
static __always_inline unsigned int total_extension_size(void)
18571857
{
18581858
/* remember to add new extensions below */
18591859
BUILD_BUG_ON(NF_CT_EXT_NUM > 9);

0 commit comments

Comments
 (0)