diff options
author | Pavel Emelianov <xemul@openvz.org> | 2007-05-03 18:13:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-05-03 18:13:45 -0400 |
commit | 7562f876cd93800f2f8c89445f2a563590b24e09 (patch) | |
tree | 78a34c011af275efa0d55ba59c3bd49b771dd533 /net/ipv6/anycast.c | |
parent | 03fba0479600114f32d29eee74ca3eaa364606bf (diff) |
[NET]: Rework dev_base via list_head (v3)
Cleanup of dev_base list use, with the aim to simplify making device
list per-namespace. In almost every occasion, use of dev_base variable
and dev->next pointer could be easily replaced by for_each_netdev
loop. A few most complicated places were converted to using
first_netdev()/next_netdev().
Signed-off-by: Pavel Emelianov <xemul@openvz.org>
Acked-by: Kirill Korotaev <dev@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/anycast.c')
-rw-r--r-- | net/ipv6/anycast.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c index 09117d63256f..9b81264eb78f 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c | |||
@@ -423,14 +423,18 @@ static int ipv6_chk_acast_dev(struct net_device *dev, struct in6_addr *addr) | |||
423 | */ | 423 | */ |
424 | int ipv6_chk_acast_addr(struct net_device *dev, struct in6_addr *addr) | 424 | int ipv6_chk_acast_addr(struct net_device *dev, struct in6_addr *addr) |
425 | { | 425 | { |
426 | int found = 0; | ||
427 | |||
426 | if (dev) | 428 | if (dev) |
427 | return ipv6_chk_acast_dev(dev, addr); | 429 | return ipv6_chk_acast_dev(dev, addr); |
428 | read_lock(&dev_base_lock); | 430 | read_lock(&dev_base_lock); |
429 | for (dev=dev_base; dev; dev=dev->next) | 431 | for_each_netdev(dev) |
430 | if (ipv6_chk_acast_dev(dev, addr)) | 432 | if (ipv6_chk_acast_dev(dev, addr)) { |
433 | found = 1; | ||
431 | break; | 434 | break; |
435 | } | ||
432 | read_unlock(&dev_base_lock); | 436 | read_unlock(&dev_base_lock); |
433 | return dev != 0; | 437 | return found; |
434 | } | 438 | } |
435 | 439 | ||
436 | 440 | ||
@@ -447,9 +451,8 @@ static inline struct ifacaddr6 *ac6_get_first(struct seq_file *seq) | |||
447 | struct ifacaddr6 *im = NULL; | 451 | struct ifacaddr6 *im = NULL; |
448 | struct ac6_iter_state *state = ac6_seq_private(seq); | 452 | struct ac6_iter_state *state = ac6_seq_private(seq); |
449 | 453 | ||
450 | for (state->dev = dev_base, state->idev = NULL; | 454 | state->idev = NULL; |
451 | state->dev; | 455 | for_each_netdev(state->dev) { |
452 | state->dev = state->dev->next) { | ||
453 | struct inet6_dev *idev; | 456 | struct inet6_dev *idev; |
454 | idev = in6_dev_get(state->dev); | 457 | idev = in6_dev_get(state->dev); |
455 | if (!idev) | 458 | if (!idev) |
@@ -476,7 +479,7 @@ static struct ifacaddr6 *ac6_get_next(struct seq_file *seq, struct ifacaddr6 *im | |||
476 | read_unlock_bh(&state->idev->lock); | 479 | read_unlock_bh(&state->idev->lock); |
477 | in6_dev_put(state->idev); | 480 | in6_dev_put(state->idev); |
478 | } | 481 | } |
479 | state->dev = state->dev->next; | 482 | state->dev = next_net_device(state->dev); |
480 | if (!state->dev) { | 483 | if (!state->dev) { |
481 | state->idev = NULL; | 484 | state->idev = NULL; |
482 | break; | 485 | break; |