From: David S. Miller <davem@davemloft.net>
Date: Mon, 7 Mar 2011 08:37:13 +0000 (-0800)
Subject: Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b8cec4a415e807a2f8679efa89558a040a7003de;p=openwrt%2Fstaging%2Fblogic.git

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

b8cec4a415e807a2f8679efa89558a040a7003de
diff --cc net/batman-adv/vis.c
index 7db9ad82cc00,3da499baf591..f90212f42082
--- a/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;
  	}