[v4] batman-adv: fix gw_node_update() and gw_election()
Commit Message
This is a regression from 8ffdea813e32cee3c60be36fb9e6a5e077e51ea0
- gw_node_update() doesn't add a new gw_node in case of empty curr_gw.
This means that at the beginning no gw_node is added, leading to an
empty gateway list.
- gw_election() is terminating in case of curr_gw == NULL. It has to
terminate in case of curr_gw != NULL
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
gateway_client.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
Comments
On Monday 25 April 2011 22:44:32 Antonio Quartulli wrote:
> This is a regression from 8ffdea813e32cee3c60be36fb9e6a5e077e51ea0
>
> - gw_node_update() doesn't add a new gw_node in case of empty curr_gw.
> This means that at the beginning no gw_node is added, leading to an
> empty gateway list.
>
> - gw_election() is terminating in case of curr_gw == NULL. It has to
> terminate in case of curr_gw != NULL
Applied in revision 66b5d57.
Thanks,
Marek
@@ -127,7 +127,7 @@ void gw_election(struct bat_priv *bat_priv)
return;
curr_gw = gw_get_selected_gw_node(bat_priv);
- if (!curr_gw)
+ if (curr_gw)
goto out;
rcu_read_lock();
@@ -311,8 +311,6 @@ void gw_node_update(struct bat_priv *bat_priv,
struct gw_node *gw_node, *curr_gw;
curr_gw = gw_get_selected_gw_node(bat_priv);
- if (!curr_gw)
- goto out;
rcu_read_lock();
hlist_for_each_entry_rcu(gw_node, node, &bat_priv->gw_list, list) {
@@ -350,7 +348,7 @@ deselect:
gw_deselect(bat_priv);
unlock:
rcu_read_unlock();
-out:
+
if (curr_gw)
gw_node_free_ref(curr_gw);
}