[linux-next] LinuxNextTracking branch, master, updated. next-20130121

batman at open-mesh.org batman at open-mesh.org
Tue Jan 22 00:19:58 CET 2013


The following commit has been merged in the master branch:
commit e76e4320a26ba6301dfd3e9a28a1e3faccd302ab
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date:   Mon Dec 24 11:14:07 2012 +0900

    batman-adv: rename random32() to prandom_u32()
    
    Use more preferable function name which implies using a pseudo-random
    number generator.
    
    Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
    Acked-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Cc: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
    Cc: Antonio Quartulli <ordex at autistici.org>
    Cc: b.a.t.m.a.n at lists.open-mesh.org
    Cc: "David S. Miller" <davem at davemloft.net>
    Cc: netdev at vger.kernel.org
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 8f2de43..36b9727 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 */

-- 
LinuxNextTracking


More information about the linux-merge mailing list