From 3a819626dcf1496bad33259d1b59b5f47a173fc8 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Sun, 3 Jun 2012 22:19:12 +0200
Subject: [PATCH] --- yaml --- r: 314708 b: refs/heads/master c:
 64346643e86d93805fcb8f722fc4817110be99d8 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/net/batman-adv/icmp_socket.c | 2 +-
 trunk/net/batman-adv/icmp_socket.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7bdedf234ef1..b8f1c0162629 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97ea4ba1f9a20d6e1921ef4d61e2248e82b429fb
+refs/heads/master: 64346643e86d93805fcb8f722fc4817110be99d8
diff --git a/trunk/net/batman-adv/icmp_socket.c b/trunk/net/batman-adv/icmp_socket.c
index b285c31bfa9e..4f45ca72fefc 100644
--- a/trunk/net/batman-adv/icmp_socket.c
+++ b/trunk/net/batman-adv/icmp_socket.c
@@ -282,7 +282,7 @@ int batadv_socket_setup(struct bat_priv *bat_priv)
 	if (!bat_priv->debug_dir)
 		goto err;
 
-	d = debugfs_create_file(ICMP_SOCKET, S_IFREG | S_IWUSR | S_IRUSR,
+	d = debugfs_create_file(BATADV_ICMP_SOCKET, S_IFREG | S_IWUSR | S_IRUSR,
 				bat_priv->debug_dir, bat_priv, &batadv_fops);
 	if (!d)
 		goto err;
diff --git a/trunk/net/batman-adv/icmp_socket.h b/trunk/net/batman-adv/icmp_socket.h
index a62ab80df9bd..f88f9f0fe7a7 100644
--- a/trunk/net/batman-adv/icmp_socket.h
+++ b/trunk/net/batman-adv/icmp_socket.h
@@ -20,7 +20,7 @@
 #ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_
 #define _NET_BATMAN_ADV_ICMP_SOCKET_H_
 
-#define ICMP_SOCKET "socket"
+#define BATADV_ICMP_SOCKET "socket"
 
 void batadv_socket_init(void);
 int batadv_socket_setup(struct bat_priv *bat_priv);