| From foo@baz Wed May 28 21:03:54 PDT 2014 |
| From: Simon Wunderlich <simon@open-mesh.com> |
| Date: Wed, 26 Mar 2014 15:46:23 +0100 |
| Subject: batman-adv: always run purge_orig_neighbors |
| |
| From: Simon Wunderlich <simon@open-mesh.com> |
| |
| [ Upstream commit 7b955a9fc164487d7c51acb9787f6d1b01b35ef6 ] |
| |
| 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 |
| 7351a4822d42827ba0110677c0cbad88a3d52585 |
| ("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> |
| Signed-off-by: Antonio Quartulli <antonio@meshcoding.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/batman-adv/originator.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/net/batman-adv/originator.c |
| +++ b/net/batman-adv/originator.c |
| @@ -857,7 +857,7 @@ static bool batadv_purge_orig_node(struc |
| { |
| 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(struc |
| 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 ... */ |
