diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-09-27 01:10:06 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:52:48 -0400 |
commit | 0cc217e16cb8ca8ef2544363571fce94259900e0 (patch) | |
tree | 05d7ef10fd9971fffa3f3870a4c3e66077bb1dc2 /net/ipv4/ipconfig.c | |
parent | 5967789dbc8aafdba5813fa8e8cfce3c90516f83 (diff) |
[IPV4]: When possible test for IFF_LOOPBACK and not dev == loopback_dev
Now that multiple loopback devices are becoming possible it makes
the code a little cleaner and more maintainable to test if a deivice
is th a loopback device by testing dev->flags & IFF_LOOPBACK instead
of dev == loopback_dev.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipconfig.c')
-rw-r--r-- | net/ipv4/ipconfig.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 2d2e0cda0470..af5d5b39fc13 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
@@ -190,11 +190,15 @@ static int __init ic_open_devs(void) | |||
190 | rtnl_lock(); | 190 | rtnl_lock(); |
191 | 191 | ||
192 | /* bring loopback device up first */ | 192 | /* bring loopback device up first */ |
193 | if (dev_change_flags(loopback_dev, loopback_dev->flags | IFF_UP) < 0) | 193 | for_each_netdev(&init_net, dev) { |
194 | printk(KERN_ERR "IP-Config: Failed to open %s\n", loopback_dev->name); | 194 | if (!(dev->flags & IFF_LOOPBACK)) |
195 | continue; | ||
196 | if (dev_change_flags(dev, dev->flags | IFF_UP) < 0) | ||
197 | printk(KERN_ERR "IP-Config: Failed to open %s\n", dev->name); | ||
198 | } | ||
195 | 199 | ||
196 | for_each_netdev(&init_net, dev) { | 200 | for_each_netdev(&init_net, dev) { |
197 | if (dev == loopback_dev) | 201 | if (dev->flags & IFF_LOOPBACK) |
198 | continue; | 202 | continue; |
199 | if (user_dev_name[0] ? !strcmp(dev->name, user_dev_name) : | 203 | if (user_dev_name[0] ? !strcmp(dev->name, user_dev_name) : |
200 | (!(dev->flags & IFF_LOOPBACK) && | 204 | (!(dev->flags & IFF_LOOPBACK) && |