From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 4 Nov 2009 18:59:38 +0000 (-0800)
Subject: decnet: avoid touching device refcount in dn_dev_by_index()
X-Git-Tag: v2.6.33-rc1~388^2~514
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b4d745db12bd2d45a456565ed63325bbfc689e68;p=~shefty%2Frdma-dev.git

decnet: avoid touching device refcount in dn_dev_by_index()

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 6e1f085db06..d82694d930b 100644
--- a/net/decnet/dn_dev.c
+++ b/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;
 }