summaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorMarek Lindner2014-02-08 16:28:18 +0100
committerAntonio Quartulli2014-03-22 08:50:26 +0100
commitaf63fde5037963b03889dd22833df502532390c0 (patch)
tree3d7e39dc7914efe9dcbb02884470c11a8f12f3f7 /net/batman-adv
parentbatman-adv: fix a few kerneldoc inconsistencies (diff)
downloadkernel-qcow2-linux-af63fde5037963b03889dd22833df502532390c0.tar.gz
kernel-qcow2-linux-af63fde5037963b03889dd22833df502532390c0.tar.xz
kernel-qcow2-linux-af63fde5037963b03889dd22833df502532390c0.zip
batman-adv: call unregister_netdev() to have it handle the locking for us
Reported-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/soft-interface.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index db3e46783c6b..633e9d67d925 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);
}
/**