Re: [B.A.T.M.A.N.] [PATCH-maint 3/3] batman-adv: always run purge_orig_neighbors

Hi Simon,

On 19/03/14 11:33, Simon Wunderlich wrote:

@@ -854,7 +854,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, changed_neigh;

  if (batadv_has_timed_out(orig_node->last_seen, 2 * BATADV_PURGE_TIMEOUT)) {

@@ -865,7 +865,8 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv, return true; } changed = batadv_purge_orig_ifinfo(bat_priv, orig_node);

• changed = changed || batadv_purge_orig_neighbors(bat_priv, orig_node);

• changed_neigh = batadv_purge_orig_neighbors(bat_priv, orig_node);

• changed |= changed_neigh;

  if (!changed)

Maybe we should just remove the |= and use this if condition: if (!changed && !changed_neigh)

?

The |= now is just useless..

Cheers,