[PATCH net] batman-adv: select an internet gateway if none was chosen
From: Antonio Quartulli <hidden>
Date: 2012-08-04 14:13:26
Also in:
batman
Subsystem:
batman advanced, the rest · Maintainers:
Marek Lindner, Simon Wunderlich, Antonio Quartulli, Sven Eckelmann, Linus Torvalds
From: Marek Lindner <redacted> This is a regression introduced by: 2265c141086474bbae55a5bb3afa1ebb78ccaa7c Reported-by: Nicolás Echániz <nicoechaniz-A9NS9UNFlhlrovVCs/uTlw@public.gmane.org> Signed-off-by: Marek Lindner <redacted> Acked-by: Antonio Quartulli <redacted> Signed-off-by: Antonio Quartulli <redacted> --- 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