From eb2c6a0f1bed684e9fd7a29e0e112c4bbb5b2117 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 12 Dec 2007 19:21:56 -0800
Subject: [PATCH] --- yaml --- r: 78435 b: refs/heads/master c:
 a66207121f85c54a3df4d347a3c5bdf6cb154b09 h: refs/heads/master i:   78433:
 18b20156b0a8b95abdb55a60377d41e9d3f5f7bb   78431:
 01629d201c4044a4f9926b3b82330bdeadb9ee40 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 49539d1d1495..ae5b0da64c02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aebcf82c1fe9231be5cb4f9c1362d5db39e7d7b2
+refs/heads/master: a66207121f85c54a3df4d347a3c5bdf6cb154b09
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 4ced3836690b..7153e94f50ad 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -3971,6 +3971,8 @@ void synchronize_net(void)
 
 void unregister_netdevice(struct net_device *dev)
 {
+	ASSERT_RTNL();
+
 	rollback_registered(dev);
 	/* Finish processing unregister after unlock */
 	net_set_todo(dev);