The following commit has been merged in the merge/master branch: commit d947cc01e3c40f891e36f0871ce181965963e334 Merge: 923d65144c55cdb099aaa826140ad9e0df2dab04 235bd568df5cbfb345b0c802238d9cc354df3a57 Author: Marek Lindner mareklindner@neomailbox.ch Date: Mon Jun 6 23:32:07 2016 +0800

Merge branch 'next'

diff --combined net/batman-adv/translation-table.c index c54d932,d033a05..9a2faf1 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -47,12 -47,10 +47,12 @@@ #include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h" +#include "log.h" #include "multicast.h" #include "originator.h" #include "packet.h" #include "soft-interface.h" +#include "tvlv.h"

/* hash class keys */ static struct lock_class_key batadv_tt_local_hash_lock_class_key; @@@ -695,7 -693,6 +695,6 @@@ bool batadv_tt_local_add(struct net_dev if (unlikely(hash_added != 0)) { /* remove the reference for the hash */ batadv_tt_local_entry_put(tt_local); - batadv_softif_vlan_put(vlan); goto out; }