2 files changed, 14 insertions, 0 deletions

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 356417379e96..53a900952282 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -205,6 +205,11 @@ void batadv_gw_check_client_stop(struct batadv_priv *bat_priv)
         if (!curr_gw)
                 return;
 
+        /* deselect the current gateway so that next time that client mode is
+         * enabled a proper GW_ADD event can be sent
+         */
+        batadv_gw_select(bat_priv, NULL);
+
         /* if batman-adv is switching the gw client mode off and a gateway was
          * already selected, send a DEL uevent
          */
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
index e28f95183a8b..b652a5648ed3 100644
--- a/net/batman-adv/sysfs.c
+++ b/net/batman-adv/sysfs.c
@@ -406,6 +406,15 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj,
         batadv_info(net_dev, "Changing gw mode from: %s to: %s\n",
                     curr_gw_mode_str, buff);
 
+        /* Invoking batadv_gw_reselect() is not enough to really de-select the
+         * current GW. It will only instruct the gateway client code to perform
+         * a re-election the next time that this is needed.
+         *
+         * When gw client mode is being switched off the current GW must be
+         * de-selected explicitly otherwise no GW_ADD uevent is thrown on
+         * client mode re-activation. This is operation is performed in
+         * batadv_gw_check_client_stop().
+         */
         batadv_gw_deselect(bat_priv);
         /* always call batadv_gw_check_client_stop() before changing the gateway
          * state