diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-24 11:30:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-24 11:30:50 -0400 |
| commit | e6e94e392fddb8845bdd2e199f55ebf7d76cb58d (patch) | |
| tree | b700374a014145367551448027eaf2fc74cfc391 /net/batman-adv/vis.h | |
| parent | f63c45e0e63fd1bccb6d021fe4de20f82114a024 (diff) | |
| parent | fa4f0afcf40361bf67ed3abd520a5fbe12d11166 (diff) | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
Included changes:
- a set of codestyle rearrangements/fixes
- new feature to early detect new joining (mesh-unaware) clients
- a minor fix for the gw-feature
- substitution of shift operations with the BIT() macro
- reorganization of the main batman-adv structure (struct batadv_priv)
- some more (very) minor cleanups and fixes
===================
Signed-off-by: David S. Miller <davem@davemloft.net>
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 84e716ed896..873282fa86d 100644 --- a/net/batman-adv/vis.h +++ b/net/batman-adv/vis.h @@ -20,7 +20,7 @@ #ifndef _NET_BATMAN_ADV_VIS_H_ #define _NET_BATMAN_ADV_VIS_H_ -/* timeout of vis packets in miliseconds */ +/* timeout of vis packets in milliseconds */ #define BATADV_VIS_TIMEOUT 200000 int batadv_vis_seq_print_text(struct seq_file *seq, void *offset); |