1 files changed, 31 insertions, 30 deletions

diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index ca57ac7d73b..9001208d175 100644
--- a/net/batman-adv/gateway_common.c
+++ b/net/batman-adv/gateway_common.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -24,7 +22,7 @@
 #include "gateway_client.h"
 
 /* calculates the gateway class from kbit */
-static void kbit_to_gw_bandwidth(int down, int up, long *gw_srv_class)
+static void batadv_kbit_to_gw_bandwidth(int down, int up, long *gw_srv_class)
 {
         int mdown = 0, tdown, tup, difference;
         uint8_t sbit, part;
@@ -59,7 +57,7 @@ static void kbit_to_gw_bandwidth(int down, int up, long *gw_srv_class)
 }
 
 /* returns the up and downspeeds in kbit, calculated from the class */
-void gw_bandwidth_to_kbit(uint8_t gw_srv_class, int *down, int *up)
+void batadv_gw_bandwidth_to_kbit(uint8_t gw_srv_class, int *down, int *up)
 {
         int sbit = (gw_srv_class & 0x80) >> 7;
         int dpart = (gw_srv_class & 0x78) >> 3;
@@ -75,8 +73,8 @@ void gw_bandwidth_to_kbit(uint8_t gw_srv_class, int *down, int *up)
         *up = ((upart + 1) * (*down)) / 8;
 }
 
-static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
-                               int *up, int *down)
+static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff,
+                                      int *up, int *down)
 {
         int ret, multi = 1;
         char *slash_ptr, *tmp_ptr;
@@ -99,9 +97,9 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
 
         ret = kstrtol(buff, 10, &ldown);
         if (ret) {
-                bat_err(net_dev,
-                        "Download speed of gateway mode invalid: %s\n",
-                        buff);
+                batadv_err(net_dev,
+                           "Download speed of gateway mode invalid: %s\n",
+                           buff);
                 return false;
         }
 
@@ -124,9 +122,9 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
 
                 ret = kstrtol(slash_ptr + 1, 10, &lup);
                 if (ret) {
-                        bat_err(net_dev,
-                                "Upload speed of gateway mode invalid: %s\n",
-                                slash_ptr + 1);
+                        batadv_err(net_dev,
+                                   "Upload speed of gateway mode invalid: %s\n",
+                                   slash_ptr + 1);
                         return false;
                 }
 
@@ -136,14 +134,15 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
         return true;
 }
 
-ssize_t gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count)
+ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff,
+                                size_t count)
 {
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
         long gw_bandwidth_tmp = 0;
         int up = 0, down = 0;
         bool ret;
 
-        ret = parse_gw_bandwidth(net_dev, buff, &up, &down);
+        ret = batadv_parse_gw_bandwidth(net_dev, buff, &up, &down);
         if (!ret)
                 goto end;
 
@@ -153,23 +152,25 @@ ssize_t gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count)
         if (!up)
                 up = down / 5;
 
-        kbit_to_gw_bandwidth(down, up, &gw_bandwidth_tmp);
+        batadv_kbit_to_gw_bandwidth(down, up, &gw_bandwidth_tmp);
 
-        /**
-         * the gw bandwidth we guessed above might not match the given
+        /* the gw bandwidth we guessed above might not match the given
          * speeds, hence we need to calculate it back to show the number
          * that is going to be propagated
-         **/
-        gw_bandwidth_to_kbit((uint8_t)gw_bandwidth_tmp, &down, &up);
-
-        gw_deselect(bat_priv);
-        bat_info(net_dev,
-                 "Changing gateway bandwidth from: '%i' to: '%ld' (propagating: %d%s/%d%s)\n",
-                 atomic_read(&bat_priv->gw_bandwidth), gw_bandwidth_tmp,
-                 (down > 2048 ? down / 1024 : down),
-                 (down > 2048 ? "MBit" : "KBit"),
-                 (up > 2048 ? up / 1024 : up),
-                 (up > 2048 ? "MBit" : "KBit"));
+         */
+        batadv_gw_bandwidth_to_kbit((uint8_t)gw_bandwidth_tmp, &down, &up);
+
+        if (atomic_read(&bat_priv->gw_bandwidth) == gw_bandwidth_tmp)
+                return count;
+
+        batadv_gw_deselect(bat_priv);
+        batadv_info(net_dev,
+                    "Changing gateway bandwidth from: '%i' to: '%ld' (propagating: %d%s/%d%s)\n",
+                    atomic_read(&bat_priv->gw_bandwidth), gw_bandwidth_tmp,
+                    (down > 2048 ? down / 1024 : down),
+                    (down > 2048 ? "MBit" : "KBit"),
+                    (up > 2048 ? up / 1024 : up),
+                    (up > 2048 ? "MBit" : "KBit"));
 
         atomic_set(&bat_priv->gw_bandwidth, gw_bandwidth_tmp);