commit 7e071c79a6964130d1df4dc5ca5a6f3638680fce
author Sven Eckelmann <sven@narfation.org> Sun Jun 03 22:19:13 2012 +0200
committer Antonio Quartulli <ordex@autistici.org> Thu Jun 28 08:45:00 2012 +0200
tree 5e6260e15caf8cfb14037b526c06a2e578e8a007
parent 64346643e86d93805fcb8f722fc4817110be99d8

batman-adv: Prefix packet defines with BATADV_

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

net/batman-adv/main.c

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 9cf0b38..986be72 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -72,7 +72,7 @@
 	register_netdevice_notifier(&batadv_hard_if_notifier);
 
 	pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n",
-		SOURCE_VERSION, COMPAT_VERSION);
+		SOURCE_VERSION, BATADV_COMPAT_VERSION);
 
 	return 0;
 }
@@ -238,7 +238,7 @@
 
 	batman_ogm_packet = (struct batman_ogm_packet *)skb->data;
 
-	if (batman_ogm_packet->header.version != COMPAT_VERSION) {
+	if (batman_ogm_packet->header.version != BATADV_COMPAT_VERSION) {
 		batadv_dbg(DBG_BATMAN, bat_priv,
 			   "Drop packet: incompatible batman version (%i)\n",
 			   batman_ogm_packet->header.version);