diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-28 15:07:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-28 15:07:52 -0500 |
| commit | 0695512a57a8ad5c0495b2a3b23b3216434e3f92 (patch) | |
| tree | dcf2cfb60274bcb9428d9ca054bb916f388ba2dc /net/batman-adv/vis.c | |
| parent | 5bd49735db39c1c1360cb91b1f1e1c999d90eb94 (diff) | |
| parent | 7c64fd98ce512de6c6dae0452dc026446bd368d5 (diff) | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/vis.c')
| -rw-r--r-- | net/batman-adv/vis.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c index ac7e66100590..c4a5b8cafada 100644 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2008-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich * @@ -714,8 +714,7 @@ static void purge_vis_packets(struct bat_priv *bat_priv) if (info == bat_priv->my_vis_info) continue; - if (time_after(jiffies, - info->first_seen + VIS_TIMEOUT * HZ)) { + if (has_timed_out(info->first_seen, VIS_TIMEOUT)) { hlist_del(node); send_list_del(info); kref_put(&info->refcount, free_info); |