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/vis.h | |
| parent | 41347dcdd81988b8e60853257b2875285cc17a4e (diff) | |
| parent | 42d0b044b7c9e5821f1bf3e2b4ea7861417c11c2 (diff) | |
| download | linux-82aee5d7c01fd1a398e938e496e6cb8841775f91.tar.gz linux-82aee5d7c01fd1a398e938e496e6cb8841775f91.tar.bz2 linux-82aee5d7c01fd1a398e938e496e6cb8841775f91.zip | |
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/vis.h')
| -rw-r--r-- | net/batman-adv/vis.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/vis.h b/net/batman-adv/vis.h index dad595870f8f..16a1a6b7e2c3 100644 --- a/net/batman-adv/vis.h +++ b/net/batman-adv/vis.h @@ -21,7 +21,7 @@ #define _NET_BATMAN_ADV_VIS_H_ /* timeout of vis packets in miliseconds */ -#define VIS_TIMEOUT 200000 +#define BATADV_VIS_TIMEOUT 200000 int batadv_vis_seq_print_text(struct seq_file *seq, void *offset); void batadv_receive_server_sync_packet(struct bat_priv *bat_priv, |