The following commit has been merged in the next branch: commit 22d41284e15244794d8dfe1224274c6ea4d598ce Author: Sven Eckelmann sven@narfation.org Date: Sun Jun 3 22:19:12 2012 +0200

batman-adv: Prefix icmp_socket defines with BATADV_

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

diff --git a/icmp_socket.c b/icmp_socket.c index 8960ee6..1f6df39 100644 --- a/icmp_socket.c +++ b/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/icmp_socket.h b/icmp_socket.h index a62ab80..f88f9f0 100644 --- a/icmp_socket.h +++ b/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);