50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 72125152cc46e55793329984428032769648904e Mon Sep 17 00:00:00 2001
|
|
From: Simon Wunderlich <simon@open-mesh.com>
|
|
Date: Wed, 26 Mar 2014 15:46:23 +0100
|
|
Subject: [PATCH 3/9] batman-adv: always run purge_orig_neighbors
|
|
|
|
The current code will not execute batadv_purge_orig_neighbors() when an
|
|
orig_ifinfo has already been purged. However we need to run it in any
|
|
case. Fix that.
|
|
|
|
This is a regression introduced by
|
|
de6bcc76ea84fecb136f8c8f5ba1862e4a13f06b ("batman-adv: split out router
|
|
from orig_node")
|
|
|
|
Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
|
|
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
---
|
|
originator.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/originator.c b/originator.c
|
|
index 25df60d..47b0886 100644
|
|
--- a/originator.c
|
|
+++ b/originator.c
|
|
@@ -857,7 +857,7 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,
|
|
{
|
|
struct batadv_neigh_node *best_neigh_node;
|
|
struct batadv_hard_iface *hard_iface;
|
|
- bool changed;
|
|
+ bool changed_ifinfo, changed_neigh;
|
|
|
|
if (batadv_has_timed_out(orig_node->last_seen,
|
|
2 * BATADV_PURGE_TIMEOUT)) {
|
|
@@ -867,10 +867,10 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,
|
|
jiffies_to_msecs(orig_node->last_seen));
|
|
return true;
|
|
}
|
|
- changed = batadv_purge_orig_ifinfo(bat_priv, orig_node);
|
|
- changed = changed || batadv_purge_orig_neighbors(bat_priv, orig_node);
|
|
+ changed_ifinfo = batadv_purge_orig_ifinfo(bat_priv, orig_node);
|
|
+ changed_neigh = batadv_purge_orig_neighbors(bat_priv, orig_node);
|
|
|
|
- if (!changed)
|
|
+ if (!changed_ifinfo && !changed_neigh)
|
|
return false;
|
|
|
|
/* first for NULL ... */
|
|
--
|
|
2.0.0.rc2
|
|
|