[B.A.T.M.A.N.] [PATCH net] batman-adv: select an internet gateway if none was chosen

[Antonio Quartulli]

From: Marek Lindner <lindner_ma...@yahoo.de>

This is a regression introduced by: 2265c141086474bbae55a5bb3afa1ebb78ccaa7c

Reported-by: Nicolás Echániz <nicoecha...@codigosur.org>
Signed-off-by: Marek Lindner <lindner_ma...@yahoo.de>
Acked-by: Antonio Quartulli <or...@autistici.org>
Signed-off-by: Antonio Quartulli <or...@autistici.org>
---
 net/batman-adv/gateway_client.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index b421cc4..fc866f2 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -200,11 +200,11 @@ void batadv_gw_election(struct batadv_priv *bat_priv)
        if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_CLIENT)
                goto out;
 
-       if (!batadv_atomic_dec_not_zero(&bat_priv->gw_reselect))
-               goto out;
-
        curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
 
+       if (!batadv_atomic_dec_not_zero(&bat_priv->gw_reselect) && curr_gw)
+               goto out;
+
        next_gw = batadv_gw_get_best_gw_node(bat_priv);
 
        if (curr_gw == next_gw)
-- 
1.7.9.4