From patchwork Mon Mar 4 12:58:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 224713 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 C71432C0311 for ; Tue, 5 Mar 2013 00:01:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758138Ab3CDM75 (ORCPT ); Mon, 4 Mar 2013 07:59:57 -0500 Received: from mail-da0-f48.google.com ([209.85.210.48]:41497 "EHLO mail-da0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758119Ab3CDM7z (ORCPT ); Mon, 4 Mar 2013 07:59:55 -0500 Received: by mail-da0-f48.google.com with SMTP id w4so2513899dam.21 for ; Mon, 04 Mar 2013 04:59:54 -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=4+86HsSetn+M1niH59LZkEPh70NiO6UIOHc0fgOXAMc=; b=LUKbaP5pIT8UMRKQPacSJSKbGcks7n414zKEk9n8vv5pTJQcGT0fdO4+kVf8VL5h/j B3z2uD5jH57BKu1yxG1iFQEehkjuavpsWvVrFAtNntO4XQqDTY9MRvnHEEgdWyDcizjr UE4JmiAkrkc2nCYzGtDhM0vTNKB9WRrdUyGDbv9syvvuH/CwT0UkONwkLQDkJs9F+lz+ 2XZ/Wb2S80ri0Qx63vDlfdQ1dGFada8RVUy4uLGadQQcug+PxdS0WR4dECTGIS0A15Bu 1HJ3i3ylG9pL0rr7NzzjWQnzRHXUkXeO+cGQ/aUn/u8nCWKrmgOgq+p3j3RkOFmC08fP ORwQ== X-Received: by 10.66.161.5 with SMTP id xo5mr32170874pab.149.1362401994348; Mon, 04 Mar 2013 04:59:54 -0800 (PST) Received: from localhost.localdomain (p2126-ipbf3106hodogaya.kanagawa.ocn.ne.jp. [114.149.157.126]) by mx.google.com with ESMTPS id t6sm23836060paz.11.2013.03.04.04.59.51 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Mar 2013 04:59:53 -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 -v3 19/23] net/netfilter: rename random32() to prandom_u32() Date: Mon, 4 Mar 2013 21:58:27 +0900 Message-Id: <1362401911-14074-20-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362401911-14074-1-git-send-email-akinobu.mita@gmail.com> References: <1362401911-14074-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 --- No change from v2 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 c8e001a..f84965a 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -264,7 +264,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; } @@ -283,7 +283,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);