From 92310e5d183115cbbf365dd65ab9875edeb4e89e Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 30 Oct 2009 01:40:11 -0700
Subject: [PATCH] --- yaml --- r: 171091 b: refs/heads/master c:
 0bd8d53656da72bc065766b5f2a05ca738020b8a h: refs/heads/master i:   171089:
 622bd849e4e5cb675d9c1764ead82b485a8c7ead   171087:
 fd0a19192473788b9d64e278512d40ac5114413f v: v3

---
 [refs]               |  2 +-
 trunk/net/core/dev.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 7504ba118d28..2dfe2831f918 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24540535d33f72505807be3e7ef2e94f3726f971
+refs/heads/master: 0bd8d53656da72bc065766b5f2a05ca738020b8a
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 631cc40da197..94f42a15fff1 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -587,13 +587,13 @@ __setup("netdev=", netdev_boot_setup);
 struct net_device *__dev_get_by_name(struct net *net, const char *name)
 {
 	struct hlist_node *p;
+	struct net_device *dev;
+	struct hlist_head *head = dev_name_hash(net, name);
 
-	hlist_for_each(p, dev_name_hash(net, name)) {
-		struct net_device *dev
-			= hlist_entry(p, struct net_device, name_hlist);
+	hlist_for_each_entry(dev, p, head, name_hlist)
 		if (!strncmp(dev->name, name, IFNAMSIZ))
 			return dev;
-	}
+
 	return NULL;
 }
 EXPORT_SYMBOL(__dev_get_by_name);
@@ -638,13 +638,13 @@ EXPORT_SYMBOL(dev_get_by_name);
 struct net_device *__dev_get_by_index(struct net *net, int ifindex)
 {
 	struct hlist_node *p;
+	struct net_device *dev;
+	struct hlist_head *head = dev_index_hash(net, ifindex);
 
-	hlist_for_each(p, dev_index_hash(net, ifindex)) {
-		struct net_device *dev
-			= hlist_entry(p, struct net_device, index_hlist);
+	hlist_for_each_entry(dev, p, head, index_hlist)
 		if (dev->ifindex == ifindex)
 			return dev;
-	}
+
 	return NULL;
 }
 EXPORT_SYMBOL(__dev_get_by_index);