summaryrefslogtreecommitdiffstats
path: root/drivers/staging/batman-adv
diff options
context:
space:
mode:
authorMarek Lindner <lindner_marek@yahoo.de>2010-06-26 00:28:21 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-08 12:17:32 -0700
commitb26b45845b29d83e7537dcd16827a478f6cee346 (patch)
tree5475a557297e5199c4d03e33fabd63c1360c3dcf /drivers/staging/batman-adv
parenta14ca61d418433b9e38b0978ceb272191377475b (diff)
downloadop-kernel-dev-b26b45845b29d83e7537dcd16827a478f6cee346.zip
op-kernel-dev-b26b45845b29d83e7537dcd16827a478f6cee346.tar.gz
Staging: batman-adv: replace manual calculation by msecs_to_jiffies() for better readability
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de> Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv')
-rw-r--r--drivers/staging/batman-adv/send.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/batman-adv/send.c b/drivers/staging/batman-adv/send.c
index 8059adb..d4b92ef 100644
--- a/drivers/staging/batman-adv/send.c
+++ b/drivers/staging/batman-adv/send.c
@@ -42,15 +42,15 @@ static uint8_t hop_penalty(const uint8_t tq)
/* when do we schedule our own packet to be sent */
static unsigned long own_send_time(struct bat_priv *bat_priv)
{
- return jiffies +
- (((atomic_read(&bat_priv->orig_interval) - JITTER +
- (random32() % 2*JITTER)) * HZ) / 1000);
+ return jiffies + msecs_to_jiffies(
+ atomic_read(&bat_priv->orig_interval) -
+ JITTER + (random32() % 2*JITTER));
}
/* when do we schedule a forwarded packet to be sent */
static unsigned long forward_send_time(struct bat_priv *bat_priv)
{
- return jiffies + (((random32() % (JITTER/2)) * HZ) / 1000);
+ return jiffies + msecs_to_jiffies(random32() % (JITTER/2));
}
/* send out an already prepared packet to the given address via the
OpenPOWER on IntegriCloud