commit cd646ab1e2edde9faeff52bbc1b40e58a5e381fc
author Sven Eckelmann <sven@narfation.org> Sun Jun 03 22:19:18 2012 +0200
committer Antonio Quartulli <ordex@autistici.org> Sun Jul 01 22:47:18 2012 +0200
tree 7608bcfc6054333d482d83a5d77276b6ee2a182a
parent a59a4d1921664da63d801ba477950114c71c88c9

batman-adv: Prefix gateway enum with BATADV_

Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

net/batman-adv/bat_iv_ogm.c

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index bbe0f12..d3fc581 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -611,7 +611,7 @@
 		batman_ogm_packet->flags &= ~VIS_SERVER;
 
 	if ((hard_iface == primary_if) &&
-	    (atomic_read(&bat_priv->gw_mode) == GW_MODE_SERVER))
+	    (atomic_read(&bat_priv->gw_mode) == BATADV_GW_MODE_SERVER))
 		batman_ogm_packet->gw_flags =
 				(uint8_t)atomic_read(&bat_priv->gw_bandwidth);
 	else
@@ -760,7 +760,7 @@
 
 	/* restart gateway selection if fast or late switching was enabled */
 	if ((orig_node->gw_flags) &&
-	    (atomic_read(&bat_priv->gw_mode) == GW_MODE_CLIENT) &&
+	    (atomic_read(&bat_priv->gw_mode) == BATADV_GW_MODE_CLIENT) &&
 	    (atomic_read(&bat_priv->gw_sel_class) > 2))
 		batadv_gw_check_election(bat_priv, orig_node);