aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/main.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-06-03 16:19:13 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-06-28 02:45:00 -0400
commit7e071c79a6964130d1df4dc5ca5a6f3638680fce (patch)
tree5e6260e15caf8cfb14037b526c06a2e578e8a007 /net/batman-adv/main.c
parent64346643e86d93805fcb8f722fc4817110be99d8 (diff)
batman-adv: Prefix packet defines with BATADV_
Reported-by: Martin Hundebøll <martin@hundeboll.net> Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/main.c')
-rw-r--r--net/batman-adv/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 9cf0b38fab8b..986be72b5144 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -72,7 +72,7 @@ static int __init batadv_init(void)
72 register_netdevice_notifier(&batadv_hard_if_notifier); 72 register_netdevice_notifier(&batadv_hard_if_notifier);
73 73
74 pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n", 74 pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n",
75 SOURCE_VERSION, COMPAT_VERSION); 75 SOURCE_VERSION, BATADV_COMPAT_VERSION);
76 76
77 return 0; 77 return 0;
78} 78}
@@ -238,7 +238,7 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
238 238
239 batman_ogm_packet = (struct batman_ogm_packet *)skb->data; 239 batman_ogm_packet = (struct batman_ogm_packet *)skb->data;
240 240
241 if (batman_ogm_packet->header.version != COMPAT_VERSION) { 241 if (batman_ogm_packet->header.version != BATADV_COMPAT_VERSION) {
242 batadv_dbg(DBG_BATMAN, bat_priv, 242 batadv_dbg(DBG_BATMAN, bat_priv,
243 "Drop packet: incompatible batman version (%i)\n", 243 "Drop packet: incompatible batman version (%i)\n",
244 batman_ogm_packet->header.version); 244 batman_ogm_packet->header.version);