|
@@ -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);
|