summaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-06-03 22:19:15 +0200
committerAntonio Quartulli <ordex@autistici.org>2012-06-28 08:45:02 +0200
commit4d5d2db8d5a40b18e562fe2fa4ef9b1f9710ff82 (patch)
treeb124e83605fd78b53e93df328368ade59fc9b2ef /net/batman-adv
parentc11fdfaefa46a83a668a73dc3ae90859e99ed251 (diff)
downloadop-kernel-dev-4d5d2db8d5a40b18e562fe2fa4ef9b1f9710ff82.zip
op-kernel-dev-4d5d2db8d5a40b18e562fe2fa4ef9b1f9710ff82.tar.gz
batman-adv: Prefix unicast 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')
-rw-r--r--net/batman-adv/originator.c2
-rw-r--r--net/batman-adv/unicast.c2
-rw-r--r--net/batman-adv/unicast.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index bf9ec39a..1980696 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -370,7 +370,7 @@ static void _batadv_purge_orig(struct bat_priv *bat_priv)
}
if (batadv_has_timed_out(orig_node->last_frag_packet,
- FRAG_TIMEOUT))
+ BATADV_FRAG_TIMEOUT))
batadv_frag_list_free(&orig_node->frag_list);
}
spin_unlock_bh(list_lock);
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index c8da6b0..8098320 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -98,7 +98,7 @@ static int batadv_frag_create_buffer(struct list_head *head)
int i;
struct frag_packet_list_entry *tfp;
- for (i = 0; i < FRAG_BUFFER_SIZE; i++) {
+ for (i = 0; i < BATADV_FRAG_BUFFER_SIZE; i++) {
tfp = kmalloc(sizeof(*tfp), GFP_ATOMIC);
if (!tfp) {
batadv_frag_list_free(head);
diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h
index 9257b83..936287f 100644
--- a/net/batman-adv/unicast.h
+++ b/net/batman-adv/unicast.h
@@ -22,8 +22,8 @@
#include "packet.h"
-#define FRAG_TIMEOUT 10000 /* purge frag list entries after time in ms */
-#define FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */
+#define BATADV_FRAG_TIMEOUT 10000 /* purge frag list entries after time in ms */
+#define BATADV_FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */
int batadv_frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
struct sk_buff **new_skb);
OpenPOWER on IntegriCloud