Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit c5765b1a98eefbf7d5888e2326d92f4b3d466611 Merge: 3e54c92 7870bad Author: Marek Lindner mareklindner@neomailbox.ch Date: Fri Jun 19 17:17:10 2015 +0800

Merge branch 'next'

c5765b1a98eefbf7d5888e2326d92f4b3d466611 net/batman-adv/originator.c | 9 +++++---- net/batman-adv/soft-interface.c | 3 +++ net/batman-adv/translation-table.c | 29 ++++++++++++++++++++++++----- 3 files changed, 32 insertions(+), 9 deletions(-)

diff --cc net/batman-adv/translation-table.c index 3aca026,aa3ca02..24ee808 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -1035,13 -1030,14 +1038,14 @@@ batadv_tt_local_set_pending(struct bata * * Returns the flags assigned to the local entry before being deleted */ -uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, - const uint8_t *addr, unsigned short vid, - const char *message, bool roaming) +u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr, + unsigned short vid, const char *message, + bool roaming) { struct batadv_tt_local_entry *tt_local_entry; - uint16_t flags, curr_flags = BATADV_NO_FLAGS; + u16 flags, curr_flags = BATADV_NO_FLAGS; struct batadv_softif_vlan *vlan; + void *tt_entry_exists;

tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid); if (!tt_local_entry)