batman-adv: fix crash on mesh cleanup in bridge loop avoidance code

Message ID 1287950297-7983-1-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Marek Lindner Oct. 24, 2010, 7:58 p.m. UTC
  Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
 batman-adv/soft-interface.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
  

Comments

Sven Eckelmann Oct. 24, 2010, 8:03 p.m. UTC | #1
Marek Lindner wrote:
> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
> ---
>  batman-adv/soft-interface.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/batman-adv/soft-interface.c b/batman-adv/soft-interface.c
> index a13276b..5ae26e8 100644
> --- a/batman-adv/soft-interface.c
> +++ b/batman-adv/soft-interface.c
> @@ -114,7 +114,6 @@ void softif_neigh_purge(struct bat_priv *bat_priv)
>  		hlist_del_rcu(&softif_neigh->list);
> 
>  		if (bat_priv->softif_neigh == softif_neigh) {
> -			bat_priv->softif_neigh = NULL;
>  			bat_dbg(DBG_ROUTES, bat_priv,
>  				 "Current mesh exit point '%pM' vanished "
>  				 "(vid: %d).\n",

Acked-by: Sven Eckelmann <sven.eckelmann@gmx.de>
  
Marek Lindner Oct. 25, 2010, 12:54 p.m. UTC | #2
On Sunday 24 October 2010 22:03:22 Sven Eckelmann wrote:
> Acked-by: Sven Eckelmann <sven.eckelmann@gmx.de>

Applied in revision 1849.

Regards,
Marek
  

Patch

diff --git a/batman-adv/soft-interface.c b/batman-adv/soft-interface.c
index a13276b..5ae26e8 100644
--- a/batman-adv/soft-interface.c
+++ b/batman-adv/soft-interface.c
@@ -114,7 +114,6 @@  void softif_neigh_purge(struct bat_priv *bat_priv)
 		hlist_del_rcu(&softif_neigh->list);
 
 		if (bat_priv->softif_neigh == softif_neigh) {
-			bat_priv->softif_neigh = NULL;
 			bat_dbg(DBG_ROUTES, bat_priv,
 				 "Current mesh exit point '%pM' vanished "
 				 "(vid: %d).\n",