Merge tag 'remoteproc-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...

[karo-tx-linux.git] / net / batman-adv / gateway_common.h

diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h
index b8fb11c4f927703204294bf31c5d0129ebabb96c..13697f6e71131e3f2cff82febf3c43486909e81d 100644 (file)
--- a/net/batman-adv/gateway_common.h
+++ b/net/batman-adv/gateway_common.h
@@ -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,23 +15,23 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_GATEWAY_COMMON_H_
 #define _NET_BATMAN_ADV_GATEWAY_COMMON_H_
 
-enum gw_modes {
-       GW_MODE_OFF,
-       GW_MODE_CLIENT,
-       GW_MODE_SERVER,
+enum batadv_gw_modes {
+       BATADV_GW_MODE_OFF,
+       BATADV_GW_MODE_CLIENT,
+       BATADV_GW_MODE_SERVER,
 };
 
-#define GW_MODE_OFF_NAME       "off"
-#define GW_MODE_CLIENT_NAME    "client"
-#define GW_MODE_SERVER_NAME    "server"
+#define BATADV_GW_MODE_OFF_NAME        "off"
+#define BATADV_GW_MODE_CLIENT_NAME     "client"
+#define BATADV_GW_MODE_SERVER_NAME     "server"
 
-void gw_bandwidth_to_kbit(uint8_t gw_class, int *down, int *up);
-ssize_t gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count);
+void batadv_gw_bandwidth_to_kbit(uint8_t gw_class, int *down, int *up);
+ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff,
+                               size_t count);
 
 #endif /* _NET_BATMAN_ADV_GATEWAY_COMMON_H_ */