---

yaml --- r: 171159 b: refs/heads/master c: b4d745d h: refs/heads/master i: 171157: 61e0759 171155: ec81361 171151: 4ae4623 v: v3
git-mirror · Nov 4, 2009 · 5b93026 · 5b93026
1 parent 12ffd43
commit 5b93026
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d94d9fee9fa4e66a0b91640a694b8b10177075b3
+refs/heads/master: b4d745db12bd2d45a456565ed63325bbfc689e68
diff --git a/trunk/net/decnet/dn_dev.c b/trunk/net/decnet/dn_dev.c
@@ -600,15 +600,17 @@ static void dn_dev_check_default(struct net_device *dev)
 		dev_put(dev);
 }
 
+/*
+ * Called with RTNL
+ */
 static struct dn_dev *dn_dev_by_index(int ifindex)
 {
 	struct net_device *dev;
 	struct dn_dev *dn_dev = NULL;
-	dev = dev_get_by_index(&init_net, ifindex);
-	if (dev) {
+
+	dev = __dev_get_by_index(&init_net, ifindex);
+	if (dev)
 		dn_dev = dev->dn_ptr;
-		dev_put(dev);
-	}
 
 	return dn_dev;
 }