netfilter: connlimit: fix UP build

Florian Westphal · ummakynes · commit e5ac6eafba88 · 2014-04-03T23:52:07.000+02:00
cannot use ARRAY_SIZE() if spinlock_t is empty struct. Fixes: 1442e75 ("netfilter: connlimit: use keyed locks") Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
@@ -377,7 +377,7 @@ static int connlimit_mt_check(const struct xt_mtchk_param *par)
 		return -ENOMEM;
 	}
 
-	for (i = 0; i < ARRAY_SIZE(info->data->locks); ++i)
+	for (i = 0; i < CONNLIMIT_LOCK_SLOTS; ++i)
 		spin_lock_init(&info->data->locks[i]);
 
 	for (i = 0; i < ARRAY_SIZE(info->data->climit_root4); ++i)

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ static int connlimit_mt_check(const struct xt_mtchk_param *par)`
`377`	`377`	`return -ENOMEM;`
`378`	`378`	`}`
`379`	`379`
`380`		`- for (i = 0; i < ARRAY_SIZE(info->data->locks); ++i)`
	`380`	`+ for (i = 0; i < CONNLIMIT_LOCK_SLOTS; ++i)`
`381`	`381`	`spin_lock_init(&info->data->locks[i]);`
`382`	`382`
`383`	`383`	`for (i = 0; i < ARRAY_SIZE(info->data->climit_root4); ++i)`