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

batman at open-mesh.org batman at open-mesh.org
Thu Jan 3 00:17:24 CET 2013


The following commit has been merged in the master branch:
commit 143cdd8f33909ff5a153e3f02048738c5964ba26
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date:   Wed Dec 26 02:32:10 2012 +0000

    batman-adv: fix random jitter calculation
    
    batadv_iv_ogm_emit_send_time() attempts to calculates a random integer
    in the range of 'orig_interval +- BATADV_JITTER' by the below lines.
    
            msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER;
            msecs += (random32() % 2 * BATADV_JITTER);
    
    But it actually gets 'orig_interval' or 'orig_interval - BATADV_JITTER'
    because '%' and '*' have same precedence and associativity is
    left-to-right.
    
    This adds the parentheses at the appropriate position so that it matches
    original intension.
    
    Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
    Acked-by: Antonio Quartulli <ordex at autistici.org>
    Cc: 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: David S. Miller <davem at davemloft.net>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 9f3925a..7d02ebd 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 += random32() % (2 * BATADV_JITTER);
 
 	return jiffies + msecs_to_jiffies(msecs);
 }

-- 
LinuxNextTracking


More information about the linux-merge mailing list