From 4d3fb1b70a9fe0992c3bb9ddab95dfe94e885f1b Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Sat, 25 Mar 2006 01:24:25 -0800 Subject: [PATCH] --- yaml --- r: 23661 b: refs/heads/master c: 9f514950bb907e98f280492a091aa1889b97304e h: refs/heads/master i: 23659: 9fc469460ec85c8547d2ebe629212c9a92531e04 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6b0f8948687c..382488a1b69b 100644 --- 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 index 08dec6eb922b..e0489ca731c5 100644 --- 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; } /**