From e599f2b7494d347217f7086e186b7c69df828c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Sat, 2 Jan 2010 11:30:42 +0100 Subject: [PATCH] --- yaml --- r: 186577 b: refs/heads/master c: 9bbf1ecdb36e2395eecbf04229eaaedce3589db5 h: refs/heads/master i: 186575: 411b4255fd1fc4cf65b8bc7daebf6286042f9ecf v: v3 --- [refs] | 2 +- trunk/drivers/staging/batman-adv/vis.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 14c5d3a7e1c6..36caebc2f47c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cec4a69cfc2bc780b4107193cb9bd621b67ab2b6 +refs/heads/master: 9bbf1ecdb36e2395eecbf04229eaaedce3589db5 diff --git a/trunk/drivers/staging/batman-adv/vis.c b/trunk/drivers/staging/batman-adv/vis.c index 086da871cd59..054631012138 100644 --- a/trunk/drivers/staging/batman-adv/vis.c +++ b/trunk/drivers/staging/batman-adv/vis.c @@ -377,7 +377,7 @@ static void purge_vis_packets(void) if (info == my_vis_info) /* never purge own data. */ continue; if (time_after(jiffies, - info->first_seen + (VIS_TIMEOUT/1000)*HZ)) { + info->first_seen + (VIS_TIMEOUT*HZ)/1000)) { hash_remove_bucket(vis_hash, &hashit); free_info(info); } @@ -556,6 +556,6 @@ void vis_quit(void) static void start_vis_timer(void) { queue_delayed_work(bat_event_workqueue, &vis_timer_wq, - (atomic_read(&vis_interval)/1000) * HZ); + (atomic_read(&vis_interval) * HZ) / 1000); }