From 5b9302676ef744432fd30d707e404a7fd173681f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 4 Nov 2009 10:59:38 -0800
Subject: [PATCH] --- yaml --- r: 171159 b: refs/heads/master c:
 b4d745db12bd2d45a456565ed63325bbfc689e68 h: refs/heads/master i:   171157:
 61e0759dc96c7686f240144728c1b1319cd8f2d9   171155:
 ec813616d8bd3fa599ff014a45779faa719d47fd   171151:
 4ae4623b8f5f416593d42e5e63f1d5d40a66c53a v: v3

---
 [refs]                    |  2 +-
 trunk/net/decnet/dn_dev.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6cc3649f4d6f..2c92ea41290d 100644
--- 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
index 6e1f085db06a..d82694d930b4 100644
--- 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;
 }