02117b65e5
More info: https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2012-July/007766.html Signed-off-by: Marek Lindner <lindner_marek@yahoo.de> git-svn-id: svn://svn.openwrt.org/openwrt/packages@32789 3c298f89-4303-0410-b956-a3cf2f4a3e73
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From 0a29f3a348c68f375585e25153da0f0a061fd71d Mon Sep 17 00:00:00 2001
|
|
From: Marek Lindner <lindner_marek@yahoo.de>
|
|
Date: Sun, 22 Jul 2012 13:04:48 +0200
|
|
Subject: [PATCH] batman-adv: select an internet gateway if none was chosen
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This is a regression introduced by: 6a17ecc4603be7f065c38b288d038a0082bbf21d
|
|
|
|
Reported-by: Nicolás Echániz <nicoechaniz@codigosur.org>
|
|
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
|
|
---
|
|
gateway_client.c | 6 +++---
|
|
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/gateway_client.c b/gateway_client.c
|
|
index 47f7186..dace001 100644
|
|
--- a/gateway_client.c
|
|
+++ b/gateway_client.c
|
|
@@ -197,11 +197,11 @@ void gw_election(struct bat_priv *bat_priv)
|
|
if (atomic_read(&bat_priv->gw_mode) != GW_MODE_CLIENT)
|
|
goto out;
|
|
|
|
- if (!atomic_dec_not_zero(&bat_priv->gw_reselect))
|
|
- goto out;
|
|
-
|
|
curr_gw = gw_get_selected_gw_node(bat_priv);
|
|
|
|
+ if (!atomic_dec_not_zero(&bat_priv->gw_reselect) && curr_gw)
|
|
+ goto out;
|
|
+
|
|
next_gw = gw_get_best_gw_node(bat_priv);
|
|
|
|
if (curr_gw == next_gw)
|
|
--
|
|
1.7.9.1
|
|
|