batman-adv/patches/0003-batman-adv-always-run-purge_orig_neighbors.patch

   1 From 72125152cc46e55793329984428032769648904e Mon Sep 17 00:00:00 2001
   2 From: Simon Wunderlich <simon@open-mesh.com>
   3 Date: Wed, 26 Mar 2014 15:46:23 +0100
   4 Subject: [PATCH 3/6] batman-adv: always run purge_orig_neighbors
   5
   6 The current code will not execute batadv_purge_orig_neighbors() when an
   7 orig_ifinfo has already been purged. However we need to run it in any
   8 case. Fix that.
   9
  10 This is a regression introduced by
  11 de6bcc76ea84fecb136f8c8f5ba1862e4a13f06b ("batman-adv: split out router
  12 from orig_node")
  13
  14 Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
  15 Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
  16 ---
  17  originator.c | 8 ++++----
  18  1 file changed, 4 insertions(+), 4 deletions(-)
  19
  20 diff --git a/originator.c b/originator.c
  21 index 25df60d..47b0886 100644
  22 --- a/originator.c
  23 +++ b/originator.c
  24 @@ -857,7 +857,7 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,
  25  {
  26         struct batadv_neigh_node *best_neigh_node;
  27         struct batadv_hard_iface *hard_iface;
  28 -       bool changed;
  29 +       bool changed_ifinfo, changed_neigh;
  30
  31         if (batadv_has_timed_out(orig_node->last_seen,
  32                                  2 * BATADV_PURGE_TIMEOUT)) {
  33 @@ -867,10 +867,10 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,
  34                            jiffies_to_msecs(orig_node->last_seen));
  35                 return true;
  36         }
  37 -       changed = batadv_purge_orig_ifinfo(bat_priv, orig_node);
  38 -       changed = changed || batadv_purge_orig_neighbors(bat_priv, orig_node);
  39 +       changed_ifinfo = batadv_purge_orig_ifinfo(bat_priv, orig_node);
  40 +       changed_neigh = batadv_purge_orig_neighbors(bat_priv, orig_node);
  41
  42 -       if (!changed)
  43 +       if (!changed_ifinfo && !changed_neigh)
  44                 return false;
  45
  46         /* first for NULL ... */
  47 --
  48 1.9.0
  49