From patchwork Mon Dec 24 02:14:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 208007 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 0F6702C0084 for ; Mon, 24 Dec 2012 13:16:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753056Ab2LXCPa (ORCPT ); Sun, 23 Dec 2012 21:15:30 -0500 Received: from mail-da0-f46.google.com ([209.85.210.46]:43642 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752924Ab2LXCPZ (ORCPT ); Sun, 23 Dec 2012 21:15:25 -0500 Received: by mail-da0-f46.google.com with SMTP id p5so2929782dak.19 for ; Sun, 23 Dec 2012 18:15:25 -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=JESCSuh1iGuhlxk6WUen+D98zJlccwSO86O4NgLcjhk=; b=GN6YC9qn3viAgen+Cdj6nNoPES1q6gljCpfLCfO9WcoSfV7Dbpo9y3eguyXROkJrrP ut5mqqnaPmG8d2PJRe67FLvmNCOb6lwjlmkXuVm3jjBv2blLqKwk2Q65uan7k3xCITNA ZHpVrQsI2VlA8mQ9XRyLSJz/qelOEIelfI7ewhk6fU9wWWhjrepG3p5aQJNFIZRcUpR6 4L9yLCcZm4Arrwhiy6k4ZcWZdC0ACvbgwqHTazD6PLXXs0rP8iGjRP4MjfaxdeTIaUV/ 8Jcca3GyfRkEfe5+kHcBDm++bFMGu3Nyw8p2O14bWtnlZzMSR0/oMSYmjBdqR+mnqen6 5PkA== X-Received: by 10.66.81.166 with SMTP id b6mr58845247pay.7.1356315325074; Sun, 23 Dec 2012 18:15:25 -0800 (PST) Received: from localhost.localdomain (p2126-ipbf3106hodogaya.kanagawa.ocn.ne.jp. [114.149.157.126]) by mx.google.com with ESMTPS id wr4sm11379909pbc.72.2012.12.23.18.15.22 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Dec 2012 18:15:24 -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 25/29] net/netfilter: rename random32() and net_random() to prandom_u32() Date: Mon, 24 Dec 2012 11:14:12 +0900 Message-Id: <1356315256-6572-26-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1356315256-6572-1-git-send-email-akinobu.mita@gmail.com> References: <1356315256-6572-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 --- net/netfilter/ipvs/ip_vs_conn.c | 2 +- net/netfilter/nf_conntrack_core.c | 4 ++-- net/netfilter/xt_statistic.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index 30e764a..870dff6 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c @@ -1200,7 +1200,7 @@ void ip_vs_random_dropentry(struct net *net) * Randomly scan 1/32 of the whole table every second */ for (idx = 0; idx < (ip_vs_conn_tab_size>>5); idx++) { - unsigned int hash = net_random() & ip_vs_conn_tab_mask; + unsigned int hash = prandom_u32() & ip_vs_conn_tab_mask; struct hlist_node *n; /* 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); diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c index 4fe4fb4..11de55e 100644 --- a/net/netfilter/xt_statistic.c +++ b/net/netfilter/xt_statistic.c @@ -37,7 +37,7 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par) switch (info->mode) { case XT_STATISTIC_MODE_RANDOM: - if ((net_random() & 0x7FFFFFFF) < info->u.random.probability) + if ((prandom_u32() & 0x7FFFFFFF) < info->u.random.probability) ret = !ret; break; case XT_STATISTIC_MODE_NTH: