diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-28 04:10:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-28 04:10:26 -0700 |
| commit | 82aee5d7c01fd1a398e938e496e6cb8841775f91 (patch) | |
| tree | 505bab77000197cb33b32ccea7bc8c7c252eb9a4 /net/batman-adv/icmp_socket.h | |
| parent | 41347dcdd81988b8e60853257b2875285cc17a4e (diff) | |
| parent | 42d0b044b7c9e5821f1bf3e2b4ea7861417c11c2 (diff) | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- another batch of patches meant to clean batman-adv namespace
- deletion of an obsolete intermediate buffer used in the visualization code to
print the output
- TT code cleanups
Diffstat (limited to 'net/batman-adv/icmp_socket.h')
| -rw-r--r-- | net/batman-adv/icmp_socket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h index a62ab80df9b..f88f9f0fe7a 100644 --- a/net/batman-adv/icmp_socket.h +++ b/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); |