diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-05 22:45:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-05 22:45:12 -0400 |
| commit | f8bae99ee5030625a4e7f0d87784191882292f0e (patch) | |
| tree | 991cd2aff1ec1b74d1e3c658eb2ea09b0f93e5bd /net/batman-adv/translation-table.h | |
| parent | 994635a137f637466d36a7c6272dae014a46a11c (diff) | |
| parent | 44c4349a2a117b22a5c4087f2ac9faf10c575e17 (diff) | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/translation-table.h')
| -rw-r--r-- | net/batman-adv/translation-table.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 1cd2d39529fe..460e5839cdd6 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h | |||
| @@ -30,8 +30,7 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr); | |||
| 30 | void tt_local_remove(struct bat_priv *bat_priv, | 30 | void tt_local_remove(struct bat_priv *bat_priv, |
| 31 | const uint8_t *addr, const char *message, bool roaming); | 31 | const uint8_t *addr, const char *message, bool roaming); |
| 32 | int tt_local_seq_print_text(struct seq_file *seq, void *offset); | 32 | int tt_local_seq_print_text(struct seq_file *seq, void *offset); |
| 33 | void tt_global_add_orig(struct bat_priv *bat_priv, | 33 | void tt_global_add_orig(struct bat_priv *bat_priv, struct orig_node *orig_node, |
| 34 | struct orig_node *orig_node, | ||
| 35 | const unsigned char *tt_buff, int tt_buff_len); | 34 | const unsigned char *tt_buff, int tt_buff_len); |
| 36 | int tt_global_add(struct bat_priv *bat_priv, | 35 | int tt_global_add(struct bat_priv *bat_priv, |
| 37 | struct orig_node *orig_node, const unsigned char *addr, | 36 | struct orig_node *orig_node, const unsigned char *addr, |