aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/core/dev.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 631cc40da19..94f42a15fff 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -587,13 +587,13 @@ __setup("netdev=", netdev_boot_setup);
587struct net_device *__dev_get_by_name(struct net *net, const char *name) 587struct net_device *__dev_get_by_name(struct net *net, const char *name)
588{ 588{
589 struct hlist_node *p; 589 struct hlist_node *p;
590 struct net_device *dev;
591 struct hlist_head *head = dev_name_hash(net, name);
590 592
591 hlist_for_each(p, dev_name_hash(net, name)) { 593 hlist_for_each_entry(dev, p, head, name_hlist)
592 struct net_device *dev
593 = hlist_entry(p, struct net_device, name_hlist);
594 if (!strncmp(dev->name, name, IFNAMSIZ)) 594 if (!strncmp(dev->name, name, IFNAMSIZ))
595 return dev; 595 return dev;
596 } 596
597 return NULL; 597 return NULL;
598} 598}
599EXPORT_SYMBOL(__dev_get_by_name); 599EXPORT_SYMBOL(__dev_get_by_name);
@@ -638,13 +638,13 @@ EXPORT_SYMBOL(dev_get_by_name);
638struct net_device *__dev_get_by_index(struct net *net, int ifindex) 638struct net_device *__dev_get_by_index(struct net *net, int ifindex)
639{ 639{
640 struct hlist_node *p; 640 struct hlist_node *p;
641 struct net_device *dev;
642 struct hlist_head *head = dev_index_hash(net, ifindex);
641 643
642 hlist_for_each(p, dev_index_hash(net, ifindex)) { 644 hlist_for_each_entry(dev, p, head, index_hlist)
643 struct net_device *dev
644 = hlist_entry(p, struct net_device, index_hlist);
645 if (dev->ifindex == ifindex) 645 if (dev->ifindex == ifindex)
646 return dev; 646 return dev;
647 } 647
648 return NULL; 648 return NULL;
649} 649}
650EXPORT_SYMBOL(__dev_get_by_index); 650EXPORT_SYMBOL(__dev_get_by_index);