From patchwork Mon Dec 24 02:14:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 208011 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 391752C007B for ; Mon, 24 Dec 2012 13:17:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752980Ab2LXCPR (ORCPT ); Sun, 23 Dec 2012 21:15:17 -0500 Received: from mail-da0-f46.google.com ([209.85.210.46]:53496 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752952Ab2LXCPO (ORCPT ); Sun, 23 Dec 2012 21:15:14 -0500 Received: by mail-da0-f46.google.com with SMTP id p5so2947303dak.33 for ; Sun, 23 Dec 2012 18:15:13 -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=nM5acx04TlufBmMM5lGasQc99HVnA9/ksTraJWoGUjc=; b=d1Fn86bJQMo9zkz/q45EFYJMq5KNXyfBAdYyL8iDWDHgebEiDYyPjIVMxbEIrK4d/C uSY3bXDNcXk6kW4LN7xh077pBkxzpHD17cwkqF2jc29pwCF4sZ9MlBudoAt73cgYdpVS T7G+9un5Nj6T1h/oatlkRQ+u4ptkqw9sGn3Y30dyt20NEjLfTrGOL8BVjIi4PmPL1XP3 suO0cFjCOTlpYZ2M41i7qcVWwnKqOMXlWBrlDAll9mWbTEKRptt5KPHe3+ncqFT2MrON poS/p84jerGmRhK5OQp8cOU6iANSRXpbLh/IyUXawXlqEcULSFdidTWTc7PuyPenCxsz LaXw== X-Received: by 10.68.83.68 with SMTP id o4mr63518012pby.25.1356315313565; Sun, 23 Dec 2012 18:15:13 -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.11 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Dec 2012 18:15:13 -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 20/29] batman-adv: rename random32() to prandom_u32() Date: Mon, 24 Dec 2012 11:14:07 +0900 Message-Id: <1356315256-6572-21-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: 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 Acked-by: Antonio Quartulli --- 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 */