From patchwork Thu Jan 3 12:19:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 209234 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8CD912C007A for ; Thu, 3 Jan 2013 23:22:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753522Ab3ACMU3 (ORCPT ); Thu, 3 Jan 2013 07:20:29 -0500 Received: from mail-pb0-f51.google.com ([209.85.160.51]:37503 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753059Ab3ACMUZ (ORCPT ); Thu, 3 Jan 2013 07:20:25 -0500 Received: by mail-pb0-f51.google.com with SMTP id ro12so8434142pbb.38 for ; Thu, 03 Jan 2013 04:20:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=wKY+DDVah2zEOHvoSHaBZ86h+vfl83CpqkW0UTcUhCY=; b=rOevG0YQ/NqhRjXKWluMcDN1KcOO9HnbsbyVyKRy85WL6EszJgUVxX2X4qbcyJ5Xpt G1tY6AAsyrevaw8+/yK9i0z6uzxKDnDiWmw9KH2CzEXOeM3R69BGVVoYR6XW0ocFaOwP 4oe59/Hr9kZ8cjjPhBDe6w1wEKOSAChkN//igBfaUckA8vm9rvUw/OL2T47j4X6mZYDp Q6pJTTqHdlvpjdkceeoUAq1RIVzPuKveFwIc2zSAYcL01sc6N1JZM3G5wAEoR+EzNBWa qThrbj1yTXST359+wbSVUwWaf3knRiBf5cpdxmFcM6Kr7lWDrvrUA2hwKNkXBRZV/4gV V4Ag== X-Received: by 10.68.232.71 with SMTP id tm7mr153519120pbc.118.1357215624272; Thu, 03 Jan 2013 04:20:24 -0800 (PST) Received: from localhost.localdomain (p2126-ipbf3106hodogaya.kanagawa.ocn.ne.jp. [114.149.157.126]) by mx.google.com with ESMTPS id qn3sm28095334pbb.56.2013.01.03.04.20.22 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Jan 2013 04:20:23 -0800 (PST) From: Akinobu Mita To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: Akinobu Mita , Pablo Neira Ayuso , Patrick McHardy , netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org, coreteam@netfilter.org, "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH -v2 22/26] net/netfilter: rename random32() to prandom_u32() Date: Thu, 3 Jan 2013 21:19:18 +0900 Message-Id: <1357215562-6288-23-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1357215562-6288-1-git-send-email-akinobu.mita@gmail.com> References: <1357215562-6288-1-git-send-email-akinobu.mita@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use more preferable function name which implies using a pseudo-random number generator. Signed-off-by: Akinobu Mita Cc: Pablo Neira Ayuso Cc: Patrick McHardy Cc: netfilter-devel@vger.kernel.org Cc: netfilter@vger.kernel.org Cc: coreteam@netfilter.org Cc: "David S. Miller" Cc: netdev@vger.kernel.org --- * Change from v1 - leave net_random() callers as-is because that is a useful indirection net/netfilter/nf_conntrack_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 08cdc71..a8f5c7a 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -263,7 +263,7 @@ static void death_by_event(unsigned long ul_conntrack) if (nf_conntrack_event(IPCT_DESTROY, ct) < 0) { /* bad luck, let's retry again */ ecache->timeout.expires = jiffies + - (random32() % net->ct.sysctl_events_retry_timeout); + (prandom_u32() % net->ct.sysctl_events_retry_timeout); add_timer(&ecache->timeout); return; } @@ -282,7 +282,7 @@ void nf_ct_dying_timeout(struct nf_conn *ct) /* set a new timer to retry event delivery */ setup_timer(&ecache->timeout, death_by_event, (unsigned long)ct); ecache->timeout.expires = jiffies + - (random32() % net->ct.sysctl_events_retry_timeout); + (prandom_u32() % net->ct.sysctl_events_retry_timeout); add_timer(&ecache->timeout); } EXPORT_SYMBOL_GPL(nf_ct_dying_timeout);