aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-06-03 16:19:12 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-06-28 02:44:59 -0400
commit64346643e86d93805fcb8f722fc4817110be99d8 (patch)
tree762ef4c8fc2a5ff09a9497cabacd52d1e6fffa44 /net/batman-adv
parent97ea4ba1f9a20d6e1921ef4d61e2248e82b429fb (diff)
batman-adv: Prefix icmp_socket 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/icmp_socket.c2
-rw-r--r--net/batman-adv/icmp_socket.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index b285c31bfa9e..4f45ca72fefc 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -282,7 +282,7 @@ int batadv_socket_setup(struct bat_priv *bat_priv)
282 if (!bat_priv->debug_dir) 282 if (!bat_priv->debug_dir)
283 goto err; 283 goto err;
284 284
285 d = debugfs_create_file(ICMP_SOCKET, S_IFREG | S_IWUSR | S_IRUSR, 285 d = debugfs_create_file(BATADV_ICMP_SOCKET, S_IFREG | S_IWUSR | S_IRUSR,
286 bat_priv->debug_dir, bat_priv, &batadv_fops); 286 bat_priv->debug_dir, bat_priv, &batadv_fops);
287 if (!d) 287 if (!d)
288 goto err; 288 goto err;
diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h
index a62ab80df9bd..f88f9f0fe7a7 100644
--- a/net/batman-adv/icmp_socket.h
+++ b/net/batman-adv/icmp_socket.h
@@ -20,7 +20,7 @@
20#ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_ 20#ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_
21#define _NET_BATMAN_ADV_ICMP_SOCKET_H_ 21#define _NET_BATMAN_ADV_ICMP_SOCKET_H_
22 22
23#define ICMP_SOCKET "socket" 23#define BATADV_ICMP_SOCKET "socket"
24 24
25void batadv_socket_init(void); 25void batadv_socket_init(void);
26int batadv_socket_setup(struct bat_priv *bat_priv); 26int batadv_socket_setup(struct bat_priv *bat_priv);