patches/0004-batman-adv-select-an-internet-gateway-if-none-was-ch.patch

   1 From 0a29f3a348c68f375585e25153da0f0a061fd71d Mon Sep 17 00:00:00 2001
   2 From: Marek Lindner <lindner_marek@yahoo.de>
   3 Date: Sun, 22 Jul 2012 13:04:48 +0200
   4 Subject: [PATCH] batman-adv: select an internet gateway if none was chosen
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 This is a regression introduced by: 6a17ecc4603be7f065c38b288d038a0082bbf21d
  10
  11 Reported-by: Nicolás Echániz <nicoechaniz@codigosur.org>
  12 Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
  13 ---
  14  gateway_client.c |    6 +++---
  15  1 files changed, 3 insertions(+), 3 deletions(-)
  16
  17 diff --git a/gateway_client.c b/gateway_client.c
  18 index 47f7186..dace001 100644
  19 --- a/gateway_client.c
  20 +++ b/gateway_client.c
  21 @@ -197,11 +197,11 @@ void gw_election(struct bat_priv *bat_priv)
  22         if (atomic_read(&bat_priv->gw_mode) != GW_MODE_CLIENT)
  23                 goto out;
  24
  25 -       if (!atomic_dec_not_zero(&bat_priv->gw_reselect))
  26 -               goto out;
  27 -
  28         curr_gw = gw_get_selected_gw_node(bat_priv);
  29
  30 +       if (!atomic_dec_not_zero(&bat_priv->gw_reselect) && curr_gw)
  31 +               goto out;
  32 +
  33         next_gw = gw_get_best_gw_node(bat_priv);
  34
  35         if (curr_gw == next_gw)
  36 --
  37 1.7.9.1
  38