From 85badc22a01097d40aa5556e4bc9f097e0ba91c2 Mon Sep 17 00:00:00 2001 From: Marek Lindner Date: Sat, 4 Aug 2012 04:13:26 +0000 Subject: [PATCH] --- yaml --- r: 321489 b: refs/heads/master c: caa0bf648cd20a2efbb6558531711e9ce2c6e948 h: refs/heads/master i: 321487: c41ac732c222cd7c91eebc4652ae77d9f5ca8cb6 v: v3 --- [refs] | 2 +- trunk/net/batman-adv/gateway_client.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8c128692a22e..36473b37fa22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25099335944a23db75d4916644122c746684e093 +refs/heads/master: caa0bf648cd20a2efbb6558531711e9ce2c6e948 diff --git a/trunk/net/batman-adv/gateway_client.c b/trunk/net/batman-adv/gateway_client.c index b421cc49d2cd..fc866f2e4528 100644 --- a/trunk/net/batman-adv/gateway_client.c +++ b/trunk/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)