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/soft-interface.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/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 2d8bd2ad6ba..8fb16d209fd 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * @@ -396,8 +396,8 @@ void softif_neigh_purge(struct bat_priv *bat_priv) hlist_for_each_entry_safe(softif_neigh, node_tmp, node_tmp2, &softif_neigh_vid->softif_neigh_list, list) { - if ((!time_after(jiffies, softif_neigh->last_seen + - msecs_to_jiffies(SOFTIF_NEIGH_TIMEOUT))) && + if ((!has_timed_out(softif_neigh->last_seen, + SOFTIF_NEIGH_TIMEOUT)) && (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE)) continue; |