Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5d20912 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

netfilter: conntrack: Fix UP builds 



ARRAY_SIZE(nf_conntrack_locks) is undefined if spinlock_t is an
empty structure. Replace it by CONNTRACK_LOCKS

Fixes: 93bb0ceb ("netfilter: conntrack: remove central spinlock nf_conntrack_lock")
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e73087af

net/netfilter/nf_conntrack_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,7 @@ int nf_conntrack_init_start(void) 
	int max_factor = 8;

	int i, ret, cpu;



	for (i = 0; i < ARRAY_SIZE(nf_conntrack_locks); i++)

	for (i = 0; i < CONNTRACK_LOCKS; i++)

		spin_lock_init(&nf_conntrack_locks[i]);



	/* Idea from tcp.c: use 1/16384 of memory.  On i386: 32MB