From patchwork Mon Mar 17 21:27:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 331177 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4F1162C00CD for ; Tue, 18 Mar 2014 08:32:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752475AbaCQVcl (ORCPT ); Mon, 17 Mar 2014 17:32:41 -0400 Received: from Chamillionaire.breakpoint.cc ([80.244.247.6]:54324 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752414AbaCQVcl (ORCPT ); Mon, 17 Mar 2014 17:32:41 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.80) (envelope-from ) id 1WPf9D-0006IY-JG; Mon, 17 Mar 2014 22:32:39 +0100 From: Florian Westphal To: netfilter-devel@vger.kernel.org Cc: netdev@vger.kernel.org, Florian Westphal Subject: [PATCH -next] netfilter: connlimit: fix UP build Date: Mon, 17 Mar 2014 22:27:50 +0100 Message-Id: <1395091670-28238-1-git-send-email-fw@strlen.de> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <53275dbf./J0nBeffRcN62Ddt%fengguang.wu@intel.com> References: <53275dbf./J0nBeffRcN62Ddt%fengguang.wu@intel.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org cannot use ARRAY_SIZE() if spinlock_t is empty struct. Fixes: 1442e7507dd597 ("netfilter: connlimit: use keyed locks") Reported-by: kbuild test robot Signed-off-by: Florian Westphal --- Another one, did UP build with LOCKDEP=y 8-( diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c index 458464e..a6e129e 100644 --- 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)