diff mbox

[maint,3/3] batman-adv: always run purge_orig_neighbors

Message ID 1395225186-18597-4-git-send-email-sw@simonwunderlich.de (mailing list archive)
State Superseded, archived
Headers

Commit Message

Simon Wunderlich March 19, 2014, 10:33 a.m. UTC 
  From: Simon Wunderlich <simon@open-mesh.com>

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>
---
 originator.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Antonio Quartulli March 19, 2014, 12:06 p.m. UTC | #1 
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,
diff mbox

Patch

diff --git a/originator.c b/originator.c
index 2fd6678..3821981 100644
--- a/originator.c
+++ b/originator.c
@@ -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)
 		return false;