diff options
Diffstat (limited to 'net/netrom')
-rw-r--r-- | net/netrom/nr_route.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c index 8e6bd4e9d82c..2f76e062609d 100644 --- a/net/netrom/nr_route.c +++ b/net/netrom/nr_route.c | |||
@@ -598,7 +598,7 @@ struct net_device *nr_dev_first(void) | |||
598 | struct net_device *dev, *first = NULL; | 598 | struct net_device *dev, *first = NULL; |
599 | 599 | ||
600 | read_lock(&dev_base_lock); | 600 | read_lock(&dev_base_lock); |
601 | for (dev = dev_base; dev != NULL; dev = dev->next) { | 601 | for_each_netdev(dev) { |
602 | if ((dev->flags & IFF_UP) && dev->type == ARPHRD_NETROM) | 602 | if ((dev->flags & IFF_UP) && dev->type == ARPHRD_NETROM) |
603 | if (first == NULL || strncmp(dev->name, first->name, 3) < 0) | 603 | if (first == NULL || strncmp(dev->name, first->name, 3) < 0) |
604 | first = dev; | 604 | first = dev; |
@@ -618,12 +618,13 @@ struct net_device *nr_dev_get(ax25_address *addr) | |||
618 | struct net_device *dev; | 618 | struct net_device *dev; |
619 | 619 | ||
620 | read_lock(&dev_base_lock); | 620 | read_lock(&dev_base_lock); |
621 | for (dev = dev_base; dev != NULL; dev = dev->next) { | 621 | for_each_netdev(dev) { |
622 | if ((dev->flags & IFF_UP) && dev->type == ARPHRD_NETROM && ax25cmp(addr, (ax25_address *)dev->dev_addr) == 0) { | 622 | if ((dev->flags & IFF_UP) && dev->type == ARPHRD_NETROM && ax25cmp(addr, (ax25_address *)dev->dev_addr) == 0) { |
623 | dev_hold(dev); | 623 | dev_hold(dev); |
624 | goto out; | 624 | goto out; |
625 | } | 625 | } |
626 | } | 626 | } |
627 | dev = NULL; | ||
627 | out: | 628 | out: |
628 | read_unlock(&dev_base_lock); | 629 | read_unlock(&dev_base_lock); |
629 | return dev; | 630 | return dev; |