commit 3964f7285eba48b971b11dc51ba0a6e41cb995b3
author Sven Eckelmann <sven@narfation.org> Sun Jun 03 22:19:10 2012 +0200
committer Antonio Quartulli <ordex@autistici.org> Thu Jun 28 08:44:56 2012 +0200
tree 32d8608a3e1ee41e80b1cc63001dc8ab14680048
parent 036cbfeb6e0595d7b85f14dd66e38adfa408e2ef

batman-adv: Prefix bridge_loop_avoidance defines with BATADV_

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

net/batman-adv/bridge_loop_avoidance.h

diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h
index 9818b1e..58563f0 100644
--- a/net/batman-adv/bridge_loop_avoidance.h
+++ b/net/batman-adv/bridge_loop_avoidance.h
@@ -36,7 +36,7 @@
 int batadv_bla_init(struct bat_priv *bat_priv);
 void batadv_bla_free(struct bat_priv *bat_priv);
 
-#define BLA_CRC_INIT	0
+#define BATADV_BLA_CRC_INIT	0
 #else /* ifdef CONFIG_BATMAN_ADV_BLA */
 
 static inline int batadv_bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb,