---

yaml --- r: 23661 b: refs/heads/master c: 9f51495 h: refs/heads/master i: 23659: 9fc4694 v: v3
git-mirror · Mar 25, 2006 · 4d3fb1b · 4d3fb1b
1 parent 03e1e8c
commit 4d3fb1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 868d2c1efe9cdd259b67a80d60a7fb2fcecd3d68
+refs/heads/master: 9f514950bb907e98f280492a091aa1889b97304e
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -977,7 +977,12 @@ int register_netdevice_notifier(struct notifier_block *nb)
 
 int unregister_netdevice_notifier(struct notifier_block *nb)
 {
-	return notifier_chain_unregister(&netdev_chain, nb);
+	int err;
+
+	rtnl_lock();
+	err = notifier_chain_unregister(&netdev_chain, nb);
+	rtnl_unlock();
+	return err;
 }
 
 /**