aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/batman-adv/originator.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/batman-adv/originator.c')
-rw-r--r--drivers/staging/batman-adv/originator.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/batman-adv/originator.c b/drivers/staging/batman-adv/originator.c
index 195c1ee0198..26bbf2d8cc3 100644
--- a/drivers/staging/batman-adv/originator.c
+++ b/drivers/staging/batman-adv/originator.c
@@ -193,8 +193,7 @@ static bool purge_orig_neighbors(struct orig_node *orig_node,
193 neigh_node = list_entry(list_pos, struct neigh_node, list); 193 neigh_node = list_entry(list_pos, struct neigh_node, list);
194 194
195 if ((time_after(jiffies, 195 if ((time_after(jiffies,
196 (neigh_node->last_valid + 196 neigh_node->last_valid + PURGE_TIMEOUT * HZ)) ||
197 ((PURGE_TIMEOUT * HZ) / 1000)))) ||
198 (neigh_node->if_incoming->if_status == 197 (neigh_node->if_incoming->if_status ==
199 IF_TO_BE_REMOVED)) { 198 IF_TO_BE_REMOVED)) {
200 199
@@ -231,8 +230,7 @@ static bool purge_orig_node(struct orig_node *orig_node)
231 struct neigh_node *best_neigh_node; 230 struct neigh_node *best_neigh_node;
232 231
233 if (time_after(jiffies, 232 if (time_after(jiffies,
234 (orig_node->last_valid + 233 orig_node->last_valid + 2 * PURGE_TIMEOUT * HZ)) {
235 ((2 * PURGE_TIMEOUT * HZ) / 1000)))) {
236 234
237 bat_dbg(DBG_BATMAN, 235 bat_dbg(DBG_BATMAN,
238 "Originator timeout: originator %pM, last_valid %lu\n", 236 "Originator timeout: originator %pM, last_valid %lu\n",