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

batman at open-mesh.org batman at open-mesh.org
Thu Dec 15 00:16:48 CET 2011


The following commit has been merged in the master branch:
commit 06ba7ce223045369cb5459f95e6c27e708938cf4
Author: Simon Wunderlich <simon.wunderlich at s2003.tu-chemnitz.de>
Date:   Mon Nov 7 13:57:48 2011 +0100

    batman-adv: use unregister_netdevice() when softif_create fails
    
    When entering softif_create(), the rtnl lock has already been acquired
    by store_mesh_iface().
    (store_mesh_iface() -> hardif_enable_interface() -> softif_create)
    
    In case of an error, we should therefore call unregister_netdevice()
    instead of unregister_netdev().
    
    unregister_netdev() tries to acquire the rtnl lock itself and deadlocks
    in this situation. unregister_netdevice() assumes that the rtnl lock
    is already been held.
    
    Signed-off-by: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 45297c8..987c75a 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -874,7 +874,7 @@ unreg_debugfs:
 unreg_sysfs:
 	sysfs_del_meshif(soft_iface);
 unreg_soft_iface:
-	unregister_netdev(soft_iface);
+	unregister_netdevice(soft_iface);
 	return NULL;
 
 free_soft_iface:

-- 
LinuxNextTracking


More information about the linux-merge mailing list