From patchwork Thu Jan 3 12:19:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 209237 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 9B9CE2C007B for ; Thu, 3 Jan 2013 23:22:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753697Ab3ACMW3 (ORCPT ); Thu, 3 Jan 2013 07:22:29 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:65102 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753487Ab3ACMUS (ORCPT ); Thu, 3 Jan 2013 07:20:18 -0500 Received: by mail-pa0-f50.google.com with SMTP id hz10so8615760pad.9 for ; Thu, 03 Jan 2013 04:20:17 -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=pEjSAMC9HF3iEEnwGB3o6jpBDFVvzB6oodysmxDP/OE=; b=pQoZpZQX0owCxWl1vumzXa8nmiwkFIx7uBt/Yn7Ze9oNMkFzDQIuLPdwbhzz+rmfq1 68JR870iLbXMhJUhLkQ5nA26BYKXX7qVbXzG6fpMhpAg5+h65tW4RKNoprDfcmNRQ0Ak 5WfiK3nyyrqR7FnWWJcrUbMBtOJvyXtDJ2iaFfKewoOr8/GNZ+6uYqlPbP6hbYA4a/kF zztqSi1Tpl0DSbdd/1ZO5syLOeKTBJOByK9tqJYfxxtnEUAC35DNS8372IrcQEO8Bno1 fuMT1ceu19XlrX/anvQ3QNiIy+XFUSl28fCUuY9cfaTKPdBBG+LTZy7ksbQEqOhRnybj 1trA== X-Received: by 10.68.213.202 with SMTP id nu10mr155223280pbc.91.1357215617573; Thu, 03 Jan 2013 04:20:17 -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.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Jan 2013 04:20:16 -0800 (PST) From: Akinobu Mita To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: Akinobu Mita , Marek Lindner , Simon Wunderlich , Antonio Quartulli , b.a.t.m.a.n@lists.open-mesh.org, "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH -v2 19/26] batman-adv: rename random32() to prandom_u32() Date: Thu, 3 Jan 2013 21:19:15 +0900 Message-Id: <1357215562-6288-20-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 Acked-by: Antonio Quartulli Cc: Marek Lindner Cc: Simon Wunderlich Cc: Antonio Quartulli Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: "David S. Miller" Cc: netdev@vger.kernel.org --- No change from v1 net/batman-adv/bat_iv_ogm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 7d02ebd..bc434c4 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -123,7 +123,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) unsigned int msecs; msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; - msecs += random32() % (2 * BATADV_JITTER); + msecs += prandom_u32() % (2 * BATADV_JITTER); return jiffies + msecs_to_jiffies(msecs); } @@ -131,7 +131,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) /* when do we schedule a ogm packet to be sent */ static unsigned long batadv_iv_ogm_fwd_send_time(void) { - return jiffies + msecs_to_jiffies(random32() % (BATADV_JITTER / 2)); + return jiffies + msecs_to_jiffies(prandom_u32() % (BATADV_JITTER / 2)); } /* apply hop penalty for a normal link */