From ad4d57f4eaa7f9725a51524338c849960b89d450 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 8 May 2008 02:53:17 -0700
Subject: [PATCH] --- yaml --- r: 96226 b: refs/heads/master c:
 e46b66bc42b6b1430b04cc5c207ecb2b2f4553dc h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 56d9161fd27b..8491c4afc47a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2ab7ac225e29006b7117d6a9fe8f3be8d98b0c2
+refs/heads/master: e46b66bc42b6b1430b04cc5c207ecb2b2f4553dc
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 4addaf0df96e..a1607bc0cd4c 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -994,6 +994,8 @@ int dev_open(struct net_device *dev)
 {
 	int ret = 0;
 
+	ASSERT_RTNL();
+
 	/*
 	 *	Is it already up?
 	 */
@@ -1060,6 +1062,8 @@ int dev_open(struct net_device *dev)
  */
 int dev_close(struct net_device *dev)
 {
+	ASSERT_RTNL();
+
 	might_sleep();
 
 	if (!(dev->flags & IFF_UP))