batman-adv: rename gw_deselect() to gw_reselect()

The function batadv_gw_deselect() is actually not deselecting
anything. It is just informing the GW code to perform a
re-election procedure when possible.
The current gateway is not being touched at all and therefore
the name of this function is rather misleading.

Rename it to batadv_gw_reselect() to batadv_gw_reselect()
to make its behaviour easier to grasp.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 53a900952282097d56c404adabe7c3c7691d5b7d..a5602ef0f262acd87d6cb3021cc03e7eebbfce07 100644 (file)
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -103,7 +103,18 @@ static void batadv_gw_select(struct batadv_priv *bat_priv,
        spin_unlock_bh(&bat_priv->gw.list_lock);
 }
 
-void batadv_gw_deselect(struct batadv_priv *bat_priv)
+/**
+ * batadv_gw_reselect - force a gateway reselection
+ * @bat_priv: the bat priv with all the soft interface information
+ *
+ * Set a flag to remind the GW component to perform a new gateway reselection.
+ * However this function does not ensure that the current gateway is going to be
+ * deselected. The reselection mechanism may elect the same gateway once again.
+ *
+ * This means that invoking batadv_gw_reselect() does not guarantee a gateway
+ * change and therefore a uevent is not necessarily expected.
+ */
+void batadv_gw_reselect(struct batadv_priv *bat_priv)
 {
        atomic_set(&bat_priv->gw.reselect, 1);
 }
@@ -242,7 +253,7 @@ void batadv_gw_election(struct batadv_priv *bat_priv)
 
                router = batadv_orig_node_get_router(next_gw->orig_node);
                if (!router) {
-                       batadv_gw_deselect(bat_priv);
+                       batadv_gw_reselect(bat_priv);
                        goto out;
                }
        }
@@ -294,11 +305,11 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv,
 
        curr_gw_orig = batadv_gw_get_selected_orig(bat_priv);
        if (!curr_gw_orig)
-               goto deselect;
+               goto reselect;
 
        router_gw = batadv_orig_node_get_router(curr_gw_orig);
        if (!router_gw)
-               goto deselect;
+               goto reselect;
 
        /* this node already is the gateway */
        if (curr_gw_orig == orig_node)
@@ -326,8 +337,8 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv,
                   "Restarting gateway selection: better gateway found (tq curr: %i, tq new: %i)\n",
                   gw_tq_avg, orig_tq_avg);
 
-deselect:
-       batadv_gw_deselect(bat_priv);
+reselect:
+       batadv_gw_reselect(bat_priv);
 out:
        if (curr_gw_orig)
                batadv_orig_node_free_ref(curr_gw_orig);
@@ -457,7 +468,7 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,
                 */
                curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
                if (gw_node == curr_gw)
-                       batadv_gw_deselect(bat_priv);
+                       batadv_gw_reselect(bat_priv);
        }
 
 out:
@@ -483,7 +494,7 @@ void batadv_gw_node_purge(struct batadv_priv *bat_priv)
        struct batadv_gw_node *gw_node, *curr_gw;
        struct hlist_node *node_tmp;
        unsigned long timeout = msecs_to_jiffies(2 * BATADV_PURGE_TIMEOUT);
-       int do_deselect = 0;
+       int do_reselect = 0;
 
        curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
 
@@ -497,7 +508,7 @@ void batadv_gw_node_purge(struct batadv_priv *bat_priv)
                        continue;
 
                if (curr_gw == gw_node)
-                       do_deselect = 1;
+                       do_reselect = 1;
 
                hlist_del_rcu(&gw_node->list);
                batadv_gw_node_free_ref(gw_node);
@@ -505,9 +516,9 @@ void batadv_gw_node_purge(struct batadv_priv *bat_priv)
 
        spin_unlock_bh(&bat_priv->gw.list_lock);
 
-       /* gw_deselect() needs to acquire the gw_list_lock */
-       if (do_deselect)
-               batadv_gw_deselect(bat_priv);
+       /* gw_reselect() needs to acquire the gw_list_lock */
+       if (do_reselect)
+               batadv_gw_reselect(bat_priv);
 
        if (curr_gw)
                batadv_gw_node_free_ref(curr_gw);

diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h
index 43c88336d40ffa63e1c8ee028d56927b9171af3c..514cff68890cb1cb4cc70ef94febb0cdfa8695dd 100644 (file)
--- a/net/batman-adv/gateway_client.h
+++ b/net/batman-adv/gateway_client.h
@@ -19,7 +19,7 @@
 #define _NET_BATMAN_ADV_GATEWAY_CLIENT_H_
 
 void batadv_gw_check_client_stop(struct batadv_priv *bat_priv);
-void batadv_gw_deselect(struct batadv_priv *bat_priv);
+void batadv_gw_reselect(struct batadv_priv *bat_priv);
 void batadv_gw_election(struct batadv_priv *bat_priv);
 struct batadv_orig_node *
 batadv_gw_get_selected_orig(struct batadv_priv *bat_priv);

diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index 5e63b8110a57fd0e044dc707606f3bcb363fa67e..f76816ce9faf877f675ec3565e284e8d7c7b7c4d 100644 (file)
--- a/net/batman-adv/gateway_common.c
+++ b/net/batman-adv/gateway_common.c
@@ -162,7 +162,7 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff,
        if ((down_curr == down_new) && (up_curr == up_new))
                return count;
 
-       batadv_gw_deselect(bat_priv);
+       batadv_gw_reselect(bat_priv);
        batadv_info(net_dev,
                    "Changing gateway bandwidth from: '%u.%u/%u.%u MBit' to: '%u.%u/%u.%u MBit'\n",
                    down_curr / 10, down_curr % 10, up_curr / 10, up_curr % 10,

diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
index b652a5648ed37b41d1081c1027c8d80fe292c2d8..511e011756548cc8a590fdd772da545129ea6e26 100644 (file)
--- a/net/batman-adv/sysfs.c
+++ b/net/batman-adv/sysfs.c
@@ -327,10 +327,10 @@ static ssize_t batadv_show_bat_algo(struct kobject *kobj,
        return sprintf(buff, "%s\n", bat_priv->bat_algo_ops->name);
 }
 
-static void batadv_post_gw_deselect(struct net_device *net_dev)
+static void batadv_post_gw_reselect(struct net_device *net_dev)
 {
        struct batadv_priv *bat_priv = netdev_priv(net_dev);
-       batadv_gw_deselect(bat_priv);
+       batadv_gw_reselect(bat_priv);
 }
 
 static ssize_t batadv_show_gw_mode(struct kobject *kobj, struct attribute *attr,
@@ -415,7 +415,7 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj,
         * client mode re-activation. This is operation is performed in
         * batadv_gw_check_client_stop().
         */
-       batadv_gw_deselect(bat_priv);
+       batadv_gw_reselect(bat_priv);
        /* always call batadv_gw_check_client_stop() before changing the gateway
         * state
         */
@@ -468,7 +468,7 @@ BATADV_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * BATADV_JITTER,
 BATADV_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, BATADV_TQ_MAX_VALUE,
                     NULL);
 BATADV_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, BATADV_TQ_MAX_VALUE,
-                    batadv_post_gw_deselect);
+                    batadv_post_gw_reselect);
 static BATADV_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth,
                   batadv_store_gw_bwidth);
 #ifdef CONFIG_BATMAN_ADV_DEBUG