aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/soft-interface.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/soft-interface.c')
-rw-r--r--net/batman-adv/soft-interface.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 2d8bd2ad6ba3..8fb16d209fd9 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: 2 * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
3 * 3 *
4 * Marek Lindner, Simon Wunderlich 4 * Marek Lindner, Simon Wunderlich
5 * 5 *
@@ -396,8 +396,8 @@ void softif_neigh_purge(struct bat_priv *bat_priv)
396 hlist_for_each_entry_safe(softif_neigh, node_tmp, node_tmp2, 396 hlist_for_each_entry_safe(softif_neigh, node_tmp, node_tmp2,
397 &softif_neigh_vid->softif_neigh_list, 397 &softif_neigh_vid->softif_neigh_list,
398 list) { 398 list) {
399 if ((!time_after(jiffies, softif_neigh->last_seen + 399 if ((!has_timed_out(softif_neigh->last_seen,
400 msecs_to_jiffies(SOFTIF_NEIGH_TIMEOUT))) && 400 SOFTIF_NEIGH_TIMEOUT)) &&
401 (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE)) 401 (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE))
402 continue; 402 continue;
403 403