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

batman at open-mesh.org batman at open-mesh.org
Wed Mar 26 00:28:00 CET 2014


The following commit has been merged in the master branch:
commit af63fde5037963b03889dd22833df502532390c0
Author: Marek Lindner <mareklindner at neomailbox.ch>
Date:   Sat Feb 8 23:28:18 2014 +0800

    batman-adv: call unregister_netdev() to have it handle the locking for us
    
    Reported-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index db3e467..633e9d6 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -652,10 +652,7 @@ static void batadv_softif_destroy_finish(struct work_struct *work)
 	}
 
 	batadv_sysfs_del_meshif(soft_iface);
-
-	rtnl_lock();
-	unregister_netdevice(soft_iface);
-	rtnl_unlock();
+	unregister_netdev(soft_iface);
 }
 
 /**

-- 
LinuxNextTracking


More information about the linux-merge mailing list