[linux-next] LinuxNextTracking branch, master, updated. next-20150107

batman at open-mesh.org batman at open-mesh.org
Thu Jan 8 00:21:29 CET 2015

The following commit has been merged in the master branch:
commit f44d54077a69b1c990aeef49cf9b813fb274cfee
Author: Martin Hundebøll <martin at hundeboll.net>
Date:   Tue Nov 11 16:22:23 2014 +0100

    batman-adv: fix lock class for decoding hash in network-coding.c
    batadv_has_set_lock_class() is called with the wrong hash table as first
    argument (probably due to a copy-paste error), which leads to false
    positives when running with lockdep.
    Introduced-by: 612d2b4fe0a1ff2f8389462a6f8be34e54124c05
    ("batman-adv: network coding - save overheard and tx packets for decoding")
    Signed-off-by: Martin Hundebøll <martin at hundeboll.net>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index 8d04d17..fab47f1 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -133,7 +133,7 @@ int batadv_nc_mesh_init(struct batadv_priv *bat_priv)
 	if (!bat_priv->nc.decoding_hash)
 		goto err;
-	batadv_hash_set_lock_class(bat_priv->nc.coding_hash,
+	batadv_hash_set_lock_class(bat_priv->nc.decoding_hash,
 	INIT_DELAYED_WORK(&bat_priv->nc.work, batadv_nc_worker);


More information about the linux-merge mailing list