diff options
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 18d8b5acc343..a06a7a58dd11 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -658,11 +658,10 @@ __setup("netdev=", netdev_boot_setup); | |||
658 | 658 | ||
659 | struct net_device *__dev_get_by_name(struct net *net, const char *name) | 659 | struct net_device *__dev_get_by_name(struct net *net, const char *name) |
660 | { | 660 | { |
661 | struct hlist_node *p; | ||
662 | struct net_device *dev; | 661 | struct net_device *dev; |
663 | struct hlist_head *head = dev_name_hash(net, name); | 662 | struct hlist_head *head = dev_name_hash(net, name); |
664 | 663 | ||
665 | hlist_for_each_entry(dev, p, head, name_hlist) | 664 | hlist_for_each_entry(dev, head, name_hlist) |
666 | if (!strncmp(dev->name, name, IFNAMSIZ)) | 665 | if (!strncmp(dev->name, name, IFNAMSIZ)) |
667 | return dev; | 666 | return dev; |
668 | 667 | ||
@@ -684,11 +683,10 @@ EXPORT_SYMBOL(__dev_get_by_name); | |||
684 | 683 | ||
685 | struct net_device *dev_get_by_name_rcu(struct net *net, const char *name) | 684 | struct net_device *dev_get_by_name_rcu(struct net *net, const char *name) |
686 | { | 685 | { |
687 | struct hlist_node *p; | ||
688 | struct net_device *dev; | 686 | struct net_device *dev; |
689 | struct hlist_head *head = dev_name_hash(net, name); | 687 | struct hlist_head *head = dev_name_hash(net, name); |
690 | 688 | ||
691 | hlist_for_each_entry_rcu(dev, p, head, name_hlist) | 689 | hlist_for_each_entry_rcu(dev, head, name_hlist) |
692 | if (!strncmp(dev->name, name, IFNAMSIZ)) | 690 | if (!strncmp(dev->name, name, IFNAMSIZ)) |
693 | return dev; | 691 | return dev; |
694 | 692 | ||
@@ -735,11 +733,10 @@ EXPORT_SYMBOL(dev_get_by_name); | |||
735 | 733 | ||
736 | struct net_device *__dev_get_by_index(struct net *net, int ifindex) | 734 | struct net_device *__dev_get_by_index(struct net *net, int ifindex) |
737 | { | 735 | { |
738 | struct hlist_node *p; | ||
739 | struct net_device *dev; | 736 | struct net_device *dev; |
740 | struct hlist_head *head = dev_index_hash(net, ifindex); | 737 | struct hlist_head *head = dev_index_hash(net, ifindex); |
741 | 738 | ||
742 | hlist_for_each_entry(dev, p, head, index_hlist) | 739 | hlist_for_each_entry(dev, head, index_hlist) |
743 | if (dev->ifindex == ifindex) | 740 | if (dev->ifindex == ifindex) |
744 | return dev; | 741 | return dev; |
745 | 742 | ||
@@ -760,11 +757,10 @@ EXPORT_SYMBOL(__dev_get_by_index); | |||
760 | 757 | ||
761 | struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex) | 758 | struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex) |
762 | { | 759 | { |
763 | struct hlist_node *p; | ||
764 | struct net_device *dev; | 760 | struct net_device *dev; |
765 | struct hlist_head *head = dev_index_hash(net, ifindex); | 761 | struct hlist_head *head = dev_index_hash(net, ifindex); |
766 | 762 | ||
767 | hlist_for_each_entry_rcu(dev, p, head, index_hlist) | 763 | hlist_for_each_entry_rcu(dev, head, index_hlist) |
768 | if (dev->ifindex == ifindex) | 764 | if (dev->ifindex == ifindex) |
769 | return dev; | 765 | return dev; |
770 | 766 | ||