Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge

diff --cc net/batman-adv/unicast.c
Simple merge

diff --cc net/batman-adv/vis.c
index 7db9ad82cc00ebe2d7fb35634dec34d258189784,3da499baf59117d35b37d3caa14a9c9ca19d5c59..f90212f420828f9b59ad8924b021ef23644da66b
--- 1/net/batman-adv/vis.c
--- 2/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@@ -442,10 -470,10 +471,10 @@@ static struct vis_info *add_packet(stru
  
        /* try to add it */
        hash_added = hash_add(bat_priv->vis_hash, vis_info_cmp, vis_info_choose,
-                             info);
+                             info, &info->hash_entry);
        if (hash_added < 0) {
                /* did not work (for some reason) */
 -              kref_put(&old_info->refcount, free_info);
 +              kref_put(&info->refcount, free_info);
                info = NULL;
        }