---

yaml --- r: 253054 b: refs/heads/master c: 41be5a4 h: refs/heads/master v: v3
git-mirror · Jun 2, 2011 · 17ab01c · 17ab01c
1 parent 9aac46b
commit 17ab01c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85e3c65fa3a1d0542c181510a950a2be7733ff29
+refs/heads/master: 41be5a4a3668810bf3687a76c2b017bd437039e0
diff --git a/trunk/net/caif/chnl_net.c b/trunk/net/caif/chnl_net.c
@@ -139,17 +139,14 @@ static void close_work(struct work_struct *work)
 	struct chnl_net *dev = NULL;
 	struct list_head *list_node;
 	struct list_head *_tmp;
-	/* May be called with or without RTNL lock held */
-	int islocked = rtnl_is_locked();
-	if (!islocked)
-		rtnl_lock();
+
+	rtnl_lock();
 	list_for_each_safe(list_node, _tmp, &chnl_net_list) {
 		dev = list_entry(list_node, struct chnl_net, list_field);
 		if (dev->state == CAIF_SHUTDOWN)
 			dev_close(dev->netdev);
 	}
-	if (!islocked)
-		rtnl_unlock();
+	rtnl_unlock();
 }
 static DECLARE_WORK(close_worker, close_work);