Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

[firefly-linux-kernel-4.4.55.git] / net / batman-adv / soft-interface.c

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 2d8bd2ad6ba384dd80be5a997821e05fe12e4a23..8fb16d209fd985a6b580d584123b1dd481ff66fe 100644 (file)
--- 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;